# [PATCH] builtin/rebase: remove a redundant space in l10n string 3 messages from 2022-06-16 to 2022-06-17. Participants: Fangyi Zhou via GitGitGadget, Junio C Hamano, Philip Oakley. Thread: https://gitlist.dev/t/58023 ## Fangyi Zhou via GitGitGadget, 2022-06-16 17:18 Subject: [PATCH] builtin/rebase: remove a redundant space in l10n string Message-ID: URL: https://gitlist.dev/e/pull.1277.git.git.1655399939066.gitgitgadget%40gmail.com ``` From: Fangyi Zhou Found in l10n. Signed-off-by: Fangyi Zhou --- 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 ``` ## Junio C Hamano, 2022-06-16 18:15 Subject: Re: [PATCH] builtin/rebase: remove a redundant space in l10n string Message-ID: URL: https://gitlist.dev/e/xmqq7d5gtqyy.fsf%40gitster.g In-Reply-To: ``` "Fangyi Zhou via GitGitGadget" writes: > From: Fangyi Zhou > > Found in l10n. > > Signed-off-by: Fangyi Zhou 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, 2022-06-17 07:09 Subject: Re: [PATCH] builtin/rebase: remove a redundant space in l10n string Message-ID: URL: https://gitlist.dev/e/f51cf5ce-9ae3-c47f-68d3-aba3bb8aee73%40iee.email In-Reply-To: ``` On 16/06/2022 19:15, Junio C Hamano wrote: > "Fangyi Zhou via GitGitGadget" writes: > >> From: Fangyi Zhou >> >> Found in l10n. >> >> Signed-off-by: Fangyi Zhou > 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 ```