Skip to content

Commit f907282

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e156455 commit f907282

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Documentation/git-cherry-pick.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ effect to your index in a row.
131131
--keep-redundant-commits::
132132
If a commit being cherry picked duplicates a commit already in the
133133
current history, it will become empty. By default these
134-
redundant commits are ignored. This option overrides that behavior and
134+
redundant commits cause `cherry-pick` to stop so the user can
135+
examine the commit. This option overrides that behavior and
135136
creates an empty commit object. Implies `--allow-empty`.
136137

137138
--strategy=<strategy>::

0 commit comments

Comments
 (0)