diff options
| author | Jeff King <peff@peff.net> | 2015-03-30 21:08:54 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-30 21:49:51 -0700 |
| commit | f907282faf9ffa90da8978c5a0dad44c299d06da (patch) | |
| tree | 93bbc875c25fad4678234b6d17e7f6e6b73903d0 | |
| parent | e156455ea49124c140a67623f22a393db62d5d98 (diff) | |
| download | git-f907282faf9ffa90da8978c5a0dad44c299d06da.tar.gz | |
cherry-pick: fix docs describing handling of empty commitsjk/cherry-pick-docfix
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>
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 3 |
1 files changed, 2 insertions, 1 deletions
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=<strategy>:: |