Re: Tracking cherry picks
- From
- Kirill Likhodedov <klikh.list@gmail.com>
- Date
- Oct 20, 2011, 15:00 UTC
- Message-ID
- <37162B20-4758-433E-B11E-CE4B7FF27FBA@gmail.com>
- In-Reply-To
- <4EA02E6C.2040608@cfl.rr.com>
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.