From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:44 +0000 (-0700)
Subject: Merge branch 'ag/rebase-p'
X-Git-Tag: v2.19.0-rc0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f72fd3106391be86b8e86d8ba1b104ef88482dbc;p=thirdparty%2Fgit.git

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

f72fd3106391be86b8e86d8ba1b104ef88482dbc