]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ag/rebase-p'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:44 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:44 +0000 (14:50 -0700)
commitf72fd3106391be86b8e86d8ba1b104ef88482dbc
treeb9bcc029324a7c8a10a88ef12c32e6fbd4f66794
parent88df0fa6597fd32b0394c544fb37d6655bd34a13
parent2e9957525ec6a25f855fcc1e99449dfa74919703
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