diff options
| author |  Tobias Klauser <tklauser@distanz.ch> | 2018-07-06 11:30:30 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-06 12:09:27 -0700 |
| commit | 2e9957525ec6a25f855fcc1e99449dfa74919703 (patch) | |
| tree | 1180e37ba44eea45a0759f10c80de6b1ae6f7dd6 | |
| parent | rebase: remove -p code from git-rebase--interactive.sh (diff) | |
| download | tgif-2e9957525ec6a25f855fcc1e99449dfa74919703.tar.xz | |
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>
| -rw-r--r-- | git-rebase--preserve-merges.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |