diff options
| author | Brian Lyles <brianmlyles@gmail.com> | 2024-03-26 00:16:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-26 00:45:41 +0100 |
| commit | bd2f9fd025e3aa2926f249e9c24f1f648e89d997 (patch) | |
| tree | dd8c9b7ff9bb5d30c8a36d2e5dc97d04084d7e27 /commit.c | |
| parent | sequencer: do not require `allow_empty` for redundant commit options (diff) | |
| download | git-bd2f9fd025e3aa2926f249e9c24f1f648e89d997.tar.xz git-bd2f9fd025e3aa2926f249e9c24f1f648e89d997.zip | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions