diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:40 -0800 |
| commit | 7b66375e6fbec4a813ed6c000f5c18fe53c1f824 (patch) | |
| tree | e804867208823a586fdb05bb6a743b6f993acd14 /aclocal.m4 | |
| parent | Merge branch 'js/test-file-size' (diff) | |
| parent | sequencer: tolerate abbreviated stopped-sha file (diff) | |
| download | tgif-7b66375e6fbec4a813ed6c000f5c18fe53c1f824.tar.xz | |
Merge branch 'jc/sequencer-stopped-sha-simplify'
Recently the format of an internal state file "rebase -i" uses has
been tightened up for consistency, which would hurt those who start
"rebase -i" with old git and then continue with new git. Loosen
the reader side a bit (which we may want to tighten again in a year
or so).
* jc/sequencer-stopped-sha-simplify:
sequencer: tolerate abbreviated stopped-sha file
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions