From: Junio C Hamano Date: Mon, 24 Nov 2008 04:36:54 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.6.1-rc1~25 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ef3b38b445c183b2a07a6360de62908d312ade0f?hp=cbacbf4e55ba53d35567578d8c97fdea6b52e16a Merge branch 'maint' * maint: Fix misleading wording for git-cherry-pick --- 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'