{"thread":{"id":"58023","subject":"[PATCH] builtin/rebase: remove a redundant space in l10n string","startedAt":"2022-06-16T17:19:17Z","lastAt":"2022-06-17T07:09:46Z","messageCount":3,"participants":["Fangyi Zhou via GitGitGadget","Junio C Hamano","Philip Oakley"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"457388","messageId":"pull.1277.git.git.1655399939066.gitgitgadget@gmail.com","threadId":"58023","inReplyTo":null,"subject":"[PATCH] builtin/rebase: remove a redundant space in l10n string","fromName":"Fangyi Zhou via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-06-16T17:18:58Z","receivedAt":"2022-06-16T17:19:17Z","isPatch":true,"sender":{"key":"me@fangyi.io","avatar":"https://avatars.githubusercontent.com/u/7815439?v=4"},"body":"From: Fangyi Zhou <me@fangyi.io>\n\nFound in l10n.\n\nSigned-off-by: Fangyi Zhou <me@fangyi.io>\n---\n    builtin/rebase: remove a redundant space in l10n string\n    \n    Found in l10n.\n    \n    Signed-off-by: Fangyi Zhou me@fangyi.io\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1277%2Ffangyi-zhou%2Ffix-rebase-extra-space-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1277/fangyi-zhou/fix-rebase-extra-space-v1\nPull-Request: https://github.com/git/git/pull/1277\n\n builtin/rebase.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex 640b6046a5a..70aa7c842f3 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1206,7 +1206,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \n \tif (preserve_merges_selected)\n \t\tdie(_(\"--preserve-merges was replaced by --rebase-merges\\n\"\n-\t\t\t\"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\\n\"\n+\t\t\t\"Note: Your `pull.rebase` configuration may also be set to 'preserve',\\n\"\n \t\t\t\"which is no longer supported; use 'merges' instead\"));\n \n \tif (action != ACTION_NONE && total_argc != 2) {\n\nbase-commit: 4f6db706e6ad145a9bf6b26a1ca0970bed27bb72\n-- \ngitgitgadget\n"},{"id":"457396","messageId":"xmqq7d5gtqyy.fsf@gitster.g","threadId":"58023","inReplyTo":"pull.1277.git.git.1655399939066.gitgitgadget@gmail.com","subject":"Re: [PATCH] builtin/rebase: remove a redundant space in l10n string","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-16T18:15:17Z","receivedAt":"2022-06-16T18:15:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Fangyi Zhou via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Fangyi Zhou <me@fangyi.io>\n>\n> Found in l10n.\n>\n> Signed-off-by: Fangyi Zhou <me@fangyi.io>\n\nThanks.\n\n> -\t\t\t\"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\\n\"\n> +\t\t\t\"Note: Your `pull.rebase` configuration may also be set to 'preserve',\\n\"\n"},{"id":"457448","messageId":"f51cf5ce-9ae3-c47f-68d3-aba3bb8aee73@iee.email","threadId":"58023","inReplyTo":"xmqq7d5gtqyy.fsf@gitster.g","subject":"Re: [PATCH] builtin/rebase: remove a redundant space in l10n string","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.email","sentAt":"2022-06-17T07:09:12Z","receivedAt":"2022-06-17T07:09:46Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"On 16/06/2022 19:15, Junio C Hamano wrote:\n> \"Fangyi Zhou via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n>\n>> From: Fangyi Zhou <me@fangyi.io>\n>>\n>> Found in l10n.\n>>\n>> Signed-off-by: Fangyi Zhou <me@fangyi.io>\n> Thanks.\n>\n>> -\t\t\t\"Note: Your `pull.rebase` configuration may also be  set to 'preserve',\\n\"\n>> +\t\t\t\"Note: Your `pull.rebase` configuration may also be set to 'preserve',\\n\"\nThat was my error. Sorry for not being able to respond at the time.\n--\nPhilip\n"}]}