mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 23:16:28 +02:00
Code

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>
This commit is contained in:
Tobias Klauser 2018-07-06 11:30:30 -07:00 committed by Junio C Hamano
parent 9384c0ca48
commit 2e9957525e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--preserve-merges.sh
View File

@ -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