diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 10:30:52 -0700 |
| commit | 4af130af0cfcb88c82eb223d964d4aa94d1d55d5 (patch) | |
| tree | 6c0ca343552da6499b8058e27051742733239bc7 /builtin/merge-ours.c | |
| parent | Merge branch 'ds/reachable' (diff) | |
| parent | sequencer: fix --allow-empty-message behavior, make it smarter (diff) | |
| download | tgif-4af130af0cfcb88c82eb223d964d4aa94d1d55d5.tar.xz | |
Merge branch 'en/sequencer-empty-edit-result-aborts'
"git rebase" etc. in Git 2.19 fails to abort when given an empty
commit log message as result of editing, which has been corrected.
* en/sequencer-empty-edit-result-aborts:
sequencer: fix --allow-empty-message behavior, make it smarter
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions