diff options
| author | Elijah Newren <newren@gmail.com> | 2020-04-11 05:44:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-12 00:15:54 +0300 |
| commit | 50ed76148a96d6cf37549c0492e6da1ff85b9bd0 (patch) | |
| tree | 7033538a0a7f305f0fc7d70c4ccf48b3ca9b8926 /builtin/rebase.c | |
| parent | b9cbd2958f235614e9af687691c96bb001945f86 (diff) | |
rebase: fix an incompatible-options error message
When the user specifies the apply backend with options that only work
with the merge backend, such as
git rebase --apply --exec /bin/true HEAD~3
the error message has always been
fatal: --exec requires an interactive rebase
This error message is misleading and was one of the reasons we renamed
the interactive backend to the merge backend. Update the error message
to state that these options merely require use of the merge backend.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 022aa2589a5..0e223a96d46 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -561,7 +561,7 @@ static void imply_merge(struct rebase_options *opts, const char *option) { switch (opts->type) { case REBASE_APPLY: - die(_("%s requires an interactive rebase"), option); + die(_("%s requires the merge backend"), option); break; case REBASE_MERGE: case REBASE_PRESERVE_MERGES: |