diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-11-23 20:36:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-23 20:36:54 -0800 |
| commit | ef3b38b445c183b2a07a6360de62908d312ade0f (patch) | |
| tree | 81f3713d6be793cea0cd340237f2d2911d112207 | |
| parent | sha1_file: avoid bogus "file exists" error message (diff) | |
| parent | Fix misleading wording for git-cherry-pick (diff) | |
| download | tgif-ef3b38b445c183b2a07a6360de62908d312ade0f.tar.xz | |
Merge branch 'maint'
* maint:
Fix misleading wording for git-cherry-pick
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 837fb08b79..b764130d26 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -55,13 +55,12 @@ OPTIONS -n:: --no-commit:: - Usually the command automatically creates a commit with - a commit log message stating which commit was - cherry-picked. This flag applies the change necessary - to cherry-pick the named commit to your working tree - and the index, but does not make the commit. In addition, - when this option is used, your index does not have to match - the HEAD commit. The cherry-pick is done against the + Usually the command automatically creates a commit. + This flag applies the change necessary to cherry-pick + the named commit to your working tree and the index, + but does not make the commit. In addition, when this + option is used, your index does not have to match the + HEAD commit. The cherry-pick is done against the beginning state of your index. + This is useful when cherry-picking more than one commits' |