From: Alexander Shopov <ash@kambanaria.org>
To: git@vger.kernel.org, gitster@pobox.com, worldhello.net@gmail.com,
alexhenrie24@gmail.com
Cc: Alexander Shopov <ash@kambanaria.org>
Subject: [Improvements on messages 1/5] rebase: trivial fix of error message
Date: Fri, 16 Feb 2024 11:15:33 +0100 [thread overview]
Message-ID: <20240216101647.28837-2-ash@kambanaria.org> (raw)
In-Reply-To: <20240216101647.28837-1-ash@kambanaria.org>
Mark --rebase-merges as option rather than variable name
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
---
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);
}
static int rebase_config(const char *var, const char *value,
--
2.43.2
next prev parent reply other threads:[~2024-02-16 10:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 10:15 [Improvements on messages 0/5] Disambuiguate between options and commands Alexander Shopov
2024-02-16 10:15 ` Alexander Shopov [this message]
2024-02-16 19:05 ` [Improvements on messages 1/5] rebase: trivial fix of error message Alex Henrie
2024-02-16 10:15 ` [Improvements on messages 2/5] transport-helper.c: " Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 3/5] builtin/remote.c: " Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 4/5] builtin/clone.c: trivial fix of message Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 5/5] revision.c: trivial fix to message Alexander Shopov
2024-02-16 18:43 ` [Improvements on messages 0/5] Disambuiguate between options and commands Junio C Hamano
2024-03-05 22:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240216101647.28837-2-ash@kambanaria.org \
--to=ash@kambanaria.org \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.