From: Junio C Hamano Date: Wed, 6 Dec 2017 17:09:03 +0000 (-0800) Subject: Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint X-Git-Tag: v2.16.0-rc0~67^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0175b6e2b9f99101b37cd4b1aa61711678a17105;p=thirdparty%2Fgit.git Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint The sequencer machinery (used by "git cherry-pick A..B", and "git rebase -i", among other things) would have lost a commit if stopped due to an unlockable index file, which has been fixed. * pw/sequencer-recover-from-unlockable-index: sequencer: reschedule pick if index can't be locked --- 0175b6e2b9f99101b37cd4b1aa61711678a17105