Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Fix misleading wording for git-cherry-pick
  • Loading branch information
Junio C Hamano committed Nov 24, 2008
2 parents cbacbf4 + 37a7744 commit ef3b38b
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions Documentation/git-cherry-pick.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit ef3b38b

Please sign in to comment.