| commit | f907282faf9ffa90da8978c5a0dad44c299d06da | |
| author | Jeff King <peff@peff.net> | |
| Tue, 31 Mar 2015 01:08:54 +0000 (30 21:08 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Mar 2015 04:49:51 +0000 (30 21:49 -0700) | ||
| tree | 93bbc875c25fad4678234b6d17e7f6e6b73903d0 | treesnapshot (tar.gz zip) |
| parent | e156455ea49124c140a67623f22a393db62d5d98 | commitdiff |
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>
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>
| Documentation/git-cherry-pick.txt | diffblobblamehistory |