diff options
author | Elijah Newren <newren@gmail.com> | 2023-01-25 04:03:51 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-01-25 09:20:53 -0800 |
commit | 925360041ca192b5dd052e5c4dceba1418e6678c (patch) | |
tree | b33277c5cac7dc07a14e3ec5c230064e0f63e284 /commit.h | |
parent | 796abac7e11ffb0ac140e93f4649bb0264f35025 (diff) |
rebase: clarify the OPT_CMDMODE incompatibilities
--edit-todo was documented as being incompatible with any of the options
for the apply backend. However, it is also incompatible with any of the
options for the merge backend, and is incompatible with any options that
are not backend specific as well. The same can be said for --continue,
--skip, --abort, --quit, etc.
This is already somewhat implicitly covered by the synopsis, but since
"[<options>]" in the first two variants are vague it might be easy to
miss this. That might not be a big deal, but since the rebase manpage
has to spend so much verbiage about incompatibility of options, making
a separate section for these options that are incompatible with
everything else seems clearer. Do that, and remove the needless
inclusion of --edit-todo in the explicit incompatibility list.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions