]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f2061f6 c779386)
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)
commit7b66375e6fbec4a813ed6c000f5c18fe53c1f824
treee804867208823a586fdb05bb6a743b6f993acd14tree | snapshot
parentf2061f698292c966498d1caec7c5ce9e2e8f67a3commit | diff
parentc77938618298539df9102c55fdb3817c5ac2f43dcommit | diff
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
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.