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 <ralf.thielow@gmail.com> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow committed
Nov 30, 2018 at 19:11 UTC
eff199a6c086930bae91f9859d4c105b4c3e9ea7
1 file changed
+2
-2
builtin/rebase.c
+2
-2
@@ -843,7 +843,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
843
"them"), REBASE_PRESERVE_MERGES),
844
OPT_BOOL(0, "rerere-autoupdate",
845
&options.allow_rerere_autoupdate,
846
- N_("allow rerere to update index with resolved "
846
+ N_("allow rerere to update index with resolved "
847
"conflict")),
848
OPT_BOOL('k', "keep-empty", &options.keep_empty,
849
N_("preserve empty commits during rebase")),
@@ -1508,7 +1508,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
1508
*/
1509
strbuf_reset(&msg);
1510
if (!oidcmp(&merge_base, &options.orig_head)) {
1511
- printf(_("Fast-forwarded %s to %s. \n"),
1511
+ printf(_("Fast-forwarded %s to %s.\n"),
1512
branch_name, options.onto_name);
1513
strbuf_addf(&msg, "rebase finished: %s onto %s",
1514
options.head_name ? options.head_name : "detached HEAD",