summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-04-21 19:12:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-21 19:12:21 (GMT)
commitc809f4258fb066078b401cfead578a7bb855a2cb (patch)
tree230d8c96225286ab113369f14f35e2ccc628691f
parentc84364abe3f7da3fdef67cc0f8762eabe2a71710 (diff)
parentf907282faf9ffa90da8978c5a0dad44c299d06da (diff)
downloadgit-c809f4258fb066078b401cfead578a7bb855a2cb.zip
git-c809f4258fb066078b401cfead578a7bb855a2cb.tar.gz
git-c809f4258fb066078b401cfead578a7bb855a2cb.tar.bz2
Merge branch 'jk/cherry-pick-docfix' into maint
* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits
-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>::