diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-12 14:28:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-12 14:28:01 -0700 |
| commit | b4f0038525623e0e5aa3b35d520de909618cae98 (patch) | |
| tree | 5f4056c2fed1880f4faddb834691ebda724bbf0e /t/t3309-notes-merge-auto-resolve.sh | |
| parent | Merge branch 'ds/sparse-add' (diff) | |
| parent | git-rebase.txt: highlight backend differences with commit rewording (diff) | |
| download | tgif-b4f0038525623e0e5aa3b35d520de909618cae98.tar.xz | |
Merge branch 'en/rebase-backend'
Band-aid fixes for two fallouts from switching the default "rebase"
backend.
* en/rebase-backend:
git-rebase.txt: highlight backend differences with commit rewording
sequencer: clear state upon dropping a become-empty commit
i18n: unmark a message in rebase.c
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions