Re: [Improvements on messages 1/5] rebase: trivial fix of error message
From: Alex Henrie <hidden>
Date: 2024-02-16 19:05:53
On Fri, Feb 16, 2024 at 3:16 AM Alexander Shopov [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Mark --rebase-merges as option rather than variable name Signed-off-by: Alexander Shopov <redacted> --- builtin/rebase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/builtin/rebase.c b/builtin/rebase.c index 4084a6abb8..9c6d971515 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c@@ -746,7 +746,7 @@ static void parse_rebase_merges_value(struct rebase_options *options, const char else if (!strcmp("rebase-cousins", value)) options->rebase_cousins = 1; else - die(_("Unknown rebase-merges mode: %s"), value); + die(_("Unknown --rebase-merges mode: %s"), value);
Hi Alexander! The other patches in this series look good to me, but I don't think this one is right. This error message could be about either the --rebase-merges command line option or the rebase.rebaseMerges config option. The word "rebase-merges" is intentionally ambiguous enough to cover both situations and was not intended to be left in English in translations. -Alex