diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2007-10-21 11:36:19 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-22 01:38:19 -0400 |
| commit | dd8175f83c725619d72d6bbaacf8eaafc158edea (patch) | |
| tree | 2dc2dca4a42141f6cece9e3d92287fa8136e4857 /Documentation/git-cherry-pick.txt | |
| parent | c32f749fec69f92ce3b076128e6322f8130bd881 (diff) | |
| download | git-dd8175f83c725619d72d6bbaacf8eaafc158edea.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-cherry-pick.txt')
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 47b1e8c2fc..76a2edfd9b 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 |