From: "Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jiang Xin <worldhello.net@gmail.com>,
Elijah Newren <newren@gmail.com>, Fangyi Zhou <me@fangyi.io>,
Fangyi Zhou <me@fangyi.io>
Subject: [PATCH] rebase: fix capitalisation autoSquash in i18n string
Date: Sun, 26 Feb 2023 18:00:29 +0000 [thread overview]
Message-ID: <pull.1462.git.git.1677434429160.gitgitgadget@gmail.com> (raw)
From: Fangyi Zhou <me@fangyi.io>
The config option (as documented) for rebase.autoSquash has a capital S,
whereas the command line option has a small case s.
Cf. <20220617100309.3224-1-worldhello.net@gmail.com>
Signed-off-by: Fangyi Zhou <me@fangyi.io>
---
rebase: fix capitalisation autoSquash in i18n string
The config option (as documented) for rebase.autoSquash has a capital S,
whereas the command line option has a small case s.
Cf. 20220617100309.3224-1-worldhello.net@gmail.com
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1462%2Ffangyi-zhou%2Frebase-i18n-message-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1462/fangyi-zhou/rebase-i18n-message-v1
Pull-Request: https://github.com/git/git/pull/1462
builtin/rebase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 6635f10d529..9a18f9b4b89 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1513,7 +1513,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
die(_("apply options and merge options "
"cannot be used together"));
else if (options.autosquash == -1 && options.config_autosquash == 1)
- die(_("apply options are incompatible with rebase.autosquash. Consider adding --no-autosquash"));
+ die(_("apply options are incompatible with rebase.autoSquash. Consider adding --no-autosquash"));
else if (options.update_refs == -1 && options.config_update_refs == 1)
die(_("apply options are incompatible with rebase.updateRefs. Consider adding --no-update-refs"));
else
base-commit: dadc8e6dacb629f46aee39bde90b6f09b73722eb
--
gitgitgadget
reply other threads:[~2023-02-26 18:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=pull.1462.git.git.1677434429160.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@fangyi.io \
--cc=newren@gmail.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.