threads / patch / 58023

patchbuiltin/rebase: remove a redundant space in l10n string

Subject: [PATCH] builtin/rebase: remove a redundant space in l10n string

## tl;dr

3 messages between Jun 16, 2022 and Jun 17, 2022. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Fangyi Zhou via GitGitGadget· Jun 16, 2022, 17:18 UTC · lore

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(-)

Show changes to builtin/rebase.c +1 −1

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

Junio C Hamano· Jun 16, 2022, 18:15 UTC · re: Fangyi Zhou via GitGitGadget · lore

Re: [PATCH] builtin/rebase: remove a redundant space in l10n string

"Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 5 quoted lines

> From: Fangyi Zhou <me@fangyi.io>
>
> Found in l10n.
>
> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Thanks.

> -			"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\n"
> +			"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n"

Philip Oakley· Jun 17, 2022, 07:09 UTC · re: Junio C Hamano · lore

Re: [PATCH] builtin/rebase: remove a redundant space in l10n string

On 16/06/2022 19:15, Junio C Hamano wrote:

Show 11 quoted lines

> "Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: Fangyi Zhou <me@fangyi.io>
>>
>> Found in l10n.
>>
>> Signed-off-by: Fangyi Zhou <me@fangyi.io>
> Thanks.
>
>> -			"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