Skip to content

Commit

Permalink
Merge branch 'jk/cherry-pick-docfix'
Browse files Browse the repository at this point in the history
* jk/cherry-pick-docfix:
  cherry-pick: fix docs describing handling of empty commits
  • Loading branch information
Junio C Hamano committed Apr 14, 2015
2 parents 1d058dc + f907282 commit 5a69705
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Documentation/git-cherry-pick.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ effect to your index in a row.
--keep-redundant-commits::
If a commit being cherry picked duplicates a commit already in the
current history, it will become empty. By default these
redundant commits are ignored. This option overrides that behavior and
redundant commits cause `cherry-pick` to stop so the user can
examine the commit. This option overrides that behavior and
creates an empty commit object. Implies `--allow-empty`.

--strategy=<strategy>::
Expand Down

0 comments on commit 5a69705

Please sign in to comment.