Skip to content

Commit c809f42

Browse files
committed
Merge branch 'jk/cherry-pick-docfix' into maint
* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits
2 parents c84364a + f907282 commit c809f42

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)