diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-25 00:50:44 +0300 |
| commit | f72fd3106391be86b8e86d8ba1b104ef88482dbc (patch) | |
| tree | b9bcc029324a7c8a10a88ef12c32e6fbd4f66794 | |
| parent | 88df0fa6597fd32b0394c544fb37d6655bd34a13 (diff) | |
| parent | 2e9957525ec6a25f855fcc1e99449dfa74919703 (diff) | |
Merge branch 'ag/rebase-p'
The help message shown in the editor to edit todo list in "rebase -p"
has regressed recently, which has been corrected.
* ag/rebase-p:
git-rebase--preserve-merges: fix formatting of todo help message
| -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 |