| commit | 0175b6e2b9f99101b37cd4b1aa61711678a17105 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:09:03 +0000 (6 09:09 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 Dec 2017 17:09:03 +0000 (6 09:09 -0800) | ||
| tree | f9e302f409b71729c0137109f2cd44c4901df32a | treesnapshot (tar.gz zip) |
| parent | 43240cb7316a7ea653ada00adfddd5ea80f90cf3 | commitdiff |
| parent | bd58886775de24ce3a330775a35c3c2e868967ee | commitdiff |
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
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 | blobhistory |