From: Ralf Wildenhues Date: Sun, 21 Oct 2007 09:36:19 +0000 (+0200) Subject: git-cherry-pick: improve description of -x. X-Git-Tag: v1.5.4-rc0~328 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd8175f83c725619d72d6bbaacf8eaafc158edea;p=git.git 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 Signed-off-by: Shawn O. Pearce --- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 47b1e8c2f..76a2edfd9 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -27,11 +27,12 @@ OPTIONS message prior committing. -x:: - Cause the command to append which commit was - cherry-picked after the original commit message when - making a commit. 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 + When recording the commit, append to the original commit + message a note that indicates which commit this change + was cherry-picked from. Append the note 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