summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-31 01:08:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-31 04:49:51 (GMT)
commitf907282faf9ffa90da8978c5a0dad44c299d06da (patch)
tree93bbc875c25fad4678234b6d17e7f6e6b73903d0 /Documentation
parente156455ea49124c140a67623f22a393db62d5d98 (diff)
downloadgit-f907282faf9ffa90da8978c5a0dad44c299d06da.zip
git-f907282faf9ffa90da8978c5a0dad44c299d06da.tar.gz
git-f907282faf9ffa90da8978c5a0dad44c299d06da.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cherry-pick.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 1c03c79..1147c71 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -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>::