From: Tobias Klauser Date: Fri, 6 Jul 2018 18:30:30 +0000 (-0700) Subject: git-rebase--preserve-merges: fix formatting of todo help message X-Git-Tag: v2.19.0-rc0~136^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e9957525ec6a25f855fcc1e99449dfa74919703;p=thirdparty%2Fgit.git git-rebase--preserve-merges: fix formatting of todo help message Part of the todo help message in git-rebase--preserve-merges.sh is unnecessarily indented, making the message look weird. Remove the extra lines and trailing indent. This was a minor regression introduced by d48f97aa ("rebase: reindent function git_rebase__interactive", 2018-03-23) in the 2.18 timeframe. The same issue exists in "rebase -i", but it is being addressed separately as part of the rewrite of the subcommand into C. Signed-off-by: Tobias Klauser Reviewed-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh index c51c7828e7..c214c5e4d6 100644 --- a/git-rebase--preserve-merges.sh +++ b/git-rebase--preserve-merges.sh @@ -891,9 +891,9 @@ $comment_char $(eval_ngettext \ EOF append_todo_help gettext " - However, if you remove everything, the rebase will be aborted. +However, if you remove everything, the rebase will be aborted. - " | git stripspace --comment-lines >>"$todo" +" | git stripspace --comment-lines >>"$todo" if test -z "$keep_empty" then