Skip to contentSkip to conversation

builtin/rebase: remove a redundant space in l10n string

PATCH In review Fangyi Zhou via GitGitGadget 3 participants 3 messages Jun 16, 2022 – Jun 17, 2022

lore
Share & tools
lore

Fangyi Zhou via GitGitGadget

author
#0 lore raw

PATCH 1/1 builtin/rebase: remove a redundant space in l10n string

From: Fangyi Zhou <[email protected]>

Found in l10n.

Signed-off-by Fangyi Zhou <[email protected]>

---
builtin/rebase: remove a redundant space in l10n string

Found in l10n.

Signed-off-by Fangyi Zhou [email protected]

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(-)
builtin/rebase.c +1 -1
index 640b6046a5a..70aa7c842f3 100644
@@ -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

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 5 lines · Fangyi Zhou via GitGitGadget

From: Fangyi Zhou <[email protected]>

Found in l10n.

Signed-off-by Fangyi Zhou <[email protected]>

Thanks.

Quoted 2 lines
builtin/rebase.c +1 -1
-			"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\n"
+			"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"
#2 lore raw
Quoted 11 lines · Junio C Hamano
Quoted 5 lines · Fangyi Zhou via GitGitGadget

From: Fangyi Zhou <[email protected]>

Found in l10n.

Signed-off-by Fangyi Zhou <[email protected]>

Thanks.

builtin/rebase.c int cmd_rebase(int argc, const char **argv, const char *prefix) · line 1209

Quoted 2 lines
builtin/rebase.c +1 -1
-			"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\n"
+			"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"

That was my error. Sorry for not being able to respond at the time. --
Philip