diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:44 -0700 |
| commit | f72fd3106391be86b8e86d8ba1b104ef88482dbc (patch) | |
| tree | b9bcc029324a7c8a10a88ef12c32e6fbd4f66794 /git-mergetool--lib.sh | |
| parent | Merge branch 'jt/connectivity-check-after-unshallow' (diff) | |
| parent | git-rebase--preserve-merges: fix formatting of todo help message (diff) | |
| download | tgif-f72fd3106391be86b8e86d8ba1b104ef88482dbc.tar.xz | |
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions