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 <tklauser@distanz.ch> Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tobias Klauser committed
Jul 6, 2018 at 11:30 UTC
2e9957525ec6a25f855fcc1e99449dfa74919703
1 file changed
+2
-2
git-rebase--preserve-merges.sh
+2
-2
@@ -891,9 +891,9 @@ $comment_char $(eval_ngettext \
891
EOF
892
append_todo_help
893
gettext "
894
- However, if you remove everything, the rebase will be aborted.
894
+However, if you remove everything, the rebase will be aborted.
895
896
- " | git stripspace --comment-lines >>"$todo"
896
+" | git stripspace --comment-lines >>"$todo"
897
898
if test -z "$keep_empty"
899
then