mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
5541bd5b8f
commit
eff199a6c0
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue