Re: Tracking cherry picks
From: Kirill Likhodedov <hidden>
Date: 2016-06-15 22:52:18
20.10.2011, в 18:21, Phillip Susi:
Why doesn't git-cherrypick record the original SHA1 it was picked from in the commit?
It does if you specify "-x" option to cherry-pick
See the man for git-cherry-pick:
-x
When recording the commit, append a line that says "(cherry picked from commit ...)" to the
original commit message in order to indicate which commit this change was cherry-picked from.
This is done only for cherry picks without conflicts. Do not use this option if you are
cherry-picking from your private branch because the information is useless to the recipient. If
on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting
a fix to a maintenance branch for an older release from a development branch), adding this
information can be useful.