development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/cherry-pick-docfix' into maint

Browse source 
* jk/cherry-pick-docfix:
  cherry-pick: fix docs describing handling of empty commits
This commit is contained in:
Junio C Hamano 2015-04-21 12:12:21 -07:00
parent c84364abe3 f907282faf
commit c809f4258f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Documentation/git-cherry-pick.txt
View file

@ -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>::