From: "Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Fangyi Zhou <me@fangyi.io>, Fangyi Zhou <me@fangyi.io>
Subject: [PATCH] builtin/rebase: remove a redundant space in l10n string
Date: Thu, 16 Jun 2022 17:18:58 +0000 [thread overview]
Message-ID: <pull.1277.git.git.1655399939066.gitgitgadget@gmail.com> (raw)
From: Fangyi Zhou <me@fangyi.io>
Found in l10n.
Signed-off-by: Fangyi Zhou <me@fangyi.io>
---
builtin/rebase: remove a redundant space in l10n string
Found in l10n.
Signed-off-by: Fangyi Zhou me@fangyi.io
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1277%2Ffangyi-zhou%2Ffix-rebase-extra-space-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1277/fangyi-zhou/fix-rebase-extra-space-v1
Pull-Request: https://github.com/git/git/pull/1277
builtin/rebase.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 640b6046a5a..70aa7c842f3 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1206,7 +1206,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (preserve_merges_selected)
die(_("--preserve-merges was replaced by --rebase-merges\n"
- "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
+ "Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
"which is no longer supported; use 'merges' instead"));
if (action != ACTION_NONE && total_argc != 2) {
base-commit: 4f6db706e6ad145a9bf6b26a1ca0970bed27bb72
--
gitgitgadget
next reply other threads:[~2022-06-16 17:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 17:18 Fangyi Zhou via GitGitGadget [this message]
2022-06-16 18:15 ` [PATCH] builtin/rebase: remove a redundant space in l10n string Junio C Hamano
2022-06-17 7:09 ` Philip Oakley
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.1277.git.git.1655399939066.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@fangyi.io \
/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.