| commit | c2ed68342b8247d99fa1204872984ce9817fbaae | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Nov 2017 02:06:35 +0000 (27 11:06 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 27 Nov 2017 02:06:35 +0000 (27 11:06 +0900) | ||
| tree | 583b53d27f5aaaf9a027bfb4f730ede64a249b11 | treesnapshot (tar.gz zip) |
| parent | 6254330e4d075be1fdbef0349b40562d25157b6e | commitdiff |
| parent | bd58886775de24ce3a330775a35c3c2e868967ee | commitdiff |
Merge branch 'pw/sequencer-recover-from-unlockable-index'
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 |