diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-01 21:41:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-01 21:41:44 +0900 |
| commit | 544d114eb2ec2fbc7be123ef29492e87c760f4c3 (patch) | |
| tree | 109b835022e6991a17bb0781262721fca9d15683 /builtin | |
| parent | Merge branch 'sg/daemon-test-signal-fix' (diff) | |
| parent | builtin/rebase.c: remove superfluous space in messages (diff) | |
| download | tgif-544d114eb2ec2fbc7be123ef29492e87c760f4c3.tar.xz | |
Merge branch 'rt/rebase-in-c-message-fix'
* rt/rebase-in-c-message-fix:
builtin/rebase.c: remove superfluous space in messages
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index c87da417fb..b5c99ec10c 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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")), @@ -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", |