From: Bryan Drewery Date: Thu, 20 Nov 2008 05:11:42 +0000 (-0600) Subject: Fix misleading wording for git-cherry-pick X-Git-Tag: v1.6.1-rc1~5^2~14 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37a7744ffe31af785571858f7341d588a6c66784;p=git.git Fix misleading wording for git-cherry-pick Documentation for -n implies that -x is normally used, however this is no longer true. Signed-off-by: Bryan Drewery Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 837fb08b7..b764130d2 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'