mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jk/cherry-pick-docfix' into maint
* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits
This commit is contained in:
commit
c809f4258f
|
@ -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>::
|
||||
|
|
Loading…
Reference in a new issue