From: Jeff King Date: Tue, 31 Mar 2015 01:08:54 +0000 (-0400) Subject: cherry-pick: fix docs describing handling of empty commits X-Git-Tag: v2.4.0-rc2~10^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f907282faf9ffa90da8978c5a0dad44c299d06da;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 1c03c792b0..1147c71da6 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=::