Skip to content

Commit 2e99575

Browse files
tklausergitster
authored andcommitted
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 d48f97a ("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 <[email protected]> Reviewed-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9384c0c commit 2e99575

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-rebase--preserve-merges.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -891,9 +891,9 @@ $comment_char $(eval_ngettext \
891891
EOF
892892
append_todo_help
893893
gettext "
894-
However, if you remove everything, the rebase will be aborted.
894+
However, if you remove everything, the rebase will be aborted.
895895
896-
" | git stripspace --comment-lines >>"$todo"
896+
" | git stripspace --comment-lines >>"$todo"
897897

898898
if test -z "$keep_empty"
899899
then

0 commit comments

Comments
 (0)