Skip to content
Snippets Groups Projects
Commit 544d114e authored by Junio C Hamano's avatar Junio C Hamano
Browse files

Merge branch 'rt/rebase-in-c-message-fix'

* rt/rebase-in-c-message-fix:
  builtin/rebase.c: remove superfluous space in messages
parents 97b6d637 eff199a6
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -888,7 +888,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")),
Loading
Loading
@@ -1549,7 +1549,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",
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment