Merge branch 'jk/cherry-pick-docfix' into maint

* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits
git-mirror · Apr 21, 2015 · c809f42 · c809f42
2 parents c84364a + f907282
commit c809f42
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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>::