From: Fangyi Zhou <me@xxxxxxxxx>
Found in l10n.
Signed-off-by: Fangyi Zhou <me@xxxxxxxxx>
---
builtin/rebase: remove a redundant space in l10n string
Found in l10n.
Signed-off-by: Fangyi Zhou me@xxxxxxxxx
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
