git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 43240cb bd58886)
Merge branch 'pw/sequencer-recover-from-unlockable-index' into maint
authorJunio C Hamano <redacted>
Wed, 6 Dec 2017 17:09:03 +0000 (09:09 -0800)
committerJunio C Hamano <redacted>
Wed, 6 Dec 2017 17:09:03 +0000 (09:09 -0800)
commit0175b6e2b9f99101b37cd4b1aa61711678a17105
treef9e302f409b71729c0137109f2cd44c4901df32atree | snapshot
parent43240cb7316a7ea653ada00adfddd5ea80f90cf3commit | diff
parentbd58886775de24ce3a330775a35c3c2e868967eecommit | diff
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
sequencer.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT