]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/sequencer-stopped-sha-simplify'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:18:39 +0000 (13:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Nov 2020 21:18:40 +0000 (13:18 -0800)
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

1  2 
sequencer.c

diff --cc sequencer.c
Simple merge