undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests 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
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:: --keep-redundant-commits::
If a commit being cherry picked duplicates a commit already in the If a commit being cherry picked duplicates a commit already in the
current history, it will become empty. By default these 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`. creates an empty commit object. Implies `--allow-empty`.
--strategy=<strategy>:: --strategy=<strategy>::