Hi Ralf,
On Fri, 30 Nov 2018, Ralf Thielow wrote:
> Signed-off-by: Ralf Thielow <ralf.thielow@xxxxxxxxx>
ACK.
The commit message could state that the scripted rebase does not have
those whitespace issues, and that this aligns the built-in rebase with it,
but I won't insist.
Ciao,
Johannes
> ---
> builtin/rebase.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 5b3e5baec8..a6acba76b4 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -871,7 +871,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")),
> @@ -1520,7 +1520,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",
> --
> 2.20.0.rc1.379.g1dd7ef354c
>
>
