aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/rebase.c
diff options
context:
space:
mode:
authorFangyi Zhou <me@fangyi.io>2022-06-16 17:18:58 +0000
committerJunio C Hamano <gitster@pobox.com>2022-06-16 11:15:23 -0700
commit3b9a5a33c2986522736d484da497ccd99d715220 (patch)
treeafa08b8d618c3c76945b018dcc59e3f37650342f /builtin/rebase.c
parent4f6db706e6ad145a9bf6b26a1ca0970bed27bb72 (diff)
downloadgit-3b9a5a33c2986522736d484da497ccd99d715220.tar.gz
builtin/rebase: remove a redundant space in l10n string
Found in l10n. Signed-off-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 640b6046a5..70aa7c842f 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) {