| commit | 2e9957525ec6a25f855fcc1e99449dfa74919703 | |
| author | Tobias Klauser <tklauser@distanz.ch> | |
| Fri, 6 Jul 2018 18:30:30 +0000 (6 11:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jul 2018 19:09:27 +0000 (6 12:09 -0700) | ||
| tree | 1180e37ba44eea45a0759f10c80de6b1ae6f7dd6 | treesnapshot (tar.gz zip) |
| parent | 9384c0ca4885f5d6617f7eb71aeb79b11ad409ec | commitdiff |
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>
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>
| git-rebase--preserve-merges.sh | diffblobblamehistory |