Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:03 +0000 (09:09 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Dec 2017 17:09:03 +0000 (09:09 -0800)
commit0175b6e...b9f99101b37cd4b1aa61711678a17105
treef9e302f...09b71729c0137109f2cd44c4901df32acopy hash to clipboard (tree)
parent43240cb...316a7ea653ada00adfddd5ea80f90cf3copy hash to clipboard (diff)
parentbd58886...75de24ce3a330775a35c3c2e868967eecopy hash to clipboard (diff)
sequencer.c