From 50ed76148a96d6cf37549c0492e6da1ff85b9bd0 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 11 Apr 2020 02:44:26 +0000 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 022aa2589a..0e223a96d4 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: -- 2.32.0.93.g670b81a890