From eff199a6c086930bae91f9859d4c105b4c3e9ea7 Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Fri, 30 Nov 2018 19:11:45 +0100 Subject: [PATCH] builtin/rebase.c: remove superfluous space in messages The whitespace breakages in these messages were introduced while reimplementing the subcommand in C. Match these messages to those in the original scripted version. Signed-off-by: Ralf Thielow Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin/rebase.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 9dc8475cd3..ba4a79e8ea 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -843,7 +843,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) "them"), REBASE_PRESERVE_MERGES), OPT_BOOL(0, "rerere-autoupdate", &options.allow_rerere_autoupdate, - N_("allow rerere to update index with resolved " + N_("allow rerere to update index with resolved " "conflict")), OPT_BOOL('k', "keep-empty", &options.keep_empty, N_("preserve empty commits during rebase")), @@ -1508,7 +1508,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) */ strbuf_reset(&msg); if (!oidcmp(&merge_base, &options.orig_head)) { - printf(_("Fast-forwarded %s to %s. \n"), + printf(_("Fast-forwarded %s to %s.\n"), branch_name, options.onto_name); strbuf_addf(&msg, "rebase finished: %s onto %s", options.head_name ? options.head_name : "detached HEAD",