| commit | bd2f9fd025e3aa2926f249e9c24f1f648e89d997 | |
| author | Brian Lyles <brianmlyles@gmail.com> | |
| Mon, 25 Mar 2024 23:16:53 +0000 (25 18:16 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Mar 2024 23:45:41 +0000 (25 16:45 -0700) | ||
| tree | dd8c9b7ff9bb5d30c8a36d2e5dc97d04084d7e27 | treesnapshot (tar.gz zip) |
| parent | 661b671aec3683718fe58f78f85359a11f57a57a | commitdiff |
cherry-pick: enforce `--keep-redundant-commits` incompatibility
When `--keep-redundant-commits` was added in b27cfb0d8d
(git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), it was
not marked as incompatible with the various operations needed to
continue or exit a cherry-pick (`--continue`, `--skip`, `--abort`, and
`--quit`).
Enforce this incompatibility via `verify_opt_compatible` like we do for
the other various options.
Signed-off-by: Brian Lyles <brianmlyles@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When `--keep-redundant-commits` was added in b27cfb0d8d
(git-cherry-pick: Add keep-redundant-commits option, 2012-04-20), it was
not marked as incompatible with the various operations needed to
continue or exit a cherry-pick (`--continue`, `--skip`, `--abort`, and
`--quit`).
Enforce this incompatibility via `verify_opt_compatible` like we do for
the other various options.
Signed-off-by: Brian Lyles <brianmlyles@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/revert.c | diffblobblamehistory | |
| t/t3505-cherry-pick-empty.sh | diffblobblamehistory |