From 37a7744ffe31af785571858f7341d588a6c66784 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Wed, 19 Nov 2008 23:11:42 -0600 Subject: 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 --- Documentation/git-cherry-pick.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Documentation') 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' -- cgit v1.2.3