Skip to content

Commit ef3b38b

Browse files
committed
Merge branch 'maint'
* maint: Fix misleading wording for git-cherry-pick
2 parents cbacbf4 + 37a7744 commit ef3b38b

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Documentation/git-cherry-pick.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ OPTIONS
5555

5656
-n::
5757
--no-commit::
58-
Usually the command automatically creates a commit with
59-
a commit log message stating which commit was
60-
cherry-picked. This flag applies the change necessary
61-
to cherry-pick the named commit to your working tree
62-
and the index, but does not make the commit. In addition,
63-
when this option is used, your index does not have to match
64-
the HEAD commit. The cherry-pick is done against the
58+
Usually the command automatically creates a commit.
59+
This flag applies the change necessary to cherry-pick
60+
the named commit to your working tree and the index,
61+
but does not make the commit. In addition, when this
62+
option is used, your index does not have to match the
63+
HEAD commit. The cherry-pick is done against the
6564
beginning state of your index.
6665
+
6766
This is useful when cherry-picking more than one commits'

0 commit comments

Comments
 (0)