kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

cherry-pick: fix docs describing handling of empty commits 

Commit b27cfb0 (git-cherry-pick: Add keep-redundant-commits
option, 2012-04-20), added the --keep-redundant-commits
option, and switched the default behavior (without that
option) to silently ignore empty commits. Later, the second
half of that commit was reverted in ac2b0e8 (cherry-pick:
regression fix for empty commits, 2012-05-29), but the
documentation added for --keep-redundant-commits was never
updated to match. Let's do so now.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2015-03-30 21:08:54 -04:00 committed by Junio C Hamano
parent e156455ea4
commit f907282faf
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>::