@matheusbsbs / matheus-bagliano / commits / dd8175f83c
Fork 0

git-cherry-pick: improve description of -x.

Reword the first sentence of the description of -x, in order to make it easier to read and understand. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Ralf Wildenhues committed Oct 21, 2007 at 11:36 UTC dd8175f83c725619d72d6bbaacf8eaafc158edea
1 file changed +6 -5
Documentation/git-cherry-pick.txt
+6 -5
@@ -27,11 +27,12 @@ OPTIONS
27 message prior committing.
28
29 -x::
30 - Cause the command to append which commit was
31 - cherry-picked after the original commit message when
32 - making a commit. Do not use this option if you are
33 - cherry-picking from your private branch because the
34 - information is useless to the recipient. If on the
30 + When recording the commit, append to the original commit
31 + message a note that indicates which commit this change
32 + was cherry-picked from. Append the note only for cherry
33 + picks without conflicts. Do not use this option if
34 + you are cherry-picking from your private branch because
35 + the information is useless to the recipient. If on the
36 other hand you are cherry-picking between two publicly
37 visible branches (e.g. backporting a fix to a
38 maintenance branch for an older release from a