diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:03 -0800 |
| commit | 0175b6e2b9f99101b37cd4b1aa61711678a17105 (patch) | |
| tree | f9e302f409b71729c0137109f2cd44c4901df32a /t/t5301-sliding-window.sh | |
| parent | Merge branch 'rs/apply-inaccurate-eof-with-incomplete-line' into maint (diff) | |
| parent | sequencer: reschedule pick if index can't be locked (diff) | |
| download | tgif-0175b6e2b9f99101b37cd4b1aa61711678a17105.tar.xz | |
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
Diffstat (limited to 't/t5301-sliding-window.sh')
0 files changed, 0 insertions, 0 deletions