diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:20 -0700 |
| commit | bd48ccf4a4daca79a1e828dec7bee91c4aebc81e (patch) | |
| tree | 92d0655bfb475e8929ed0a67dec039d35e2f2038 /ll-merge.c | |
| parent | Merge branch 'ds/commit-graph-incremental' (diff) | |
| parent | status: do not report errors in sequencer/todo (diff) | |
| download | tgif-bd48ccf4a4daca79a1e828dec7bee91c4aebc81e.tar.xz | |
Merge branch 'pw/status-with-corrupt-sequencer-state'
The code to read state files used by the sequencer machinery for
"git status" has been made more robust against a corrupt or stale
state files.
* pw/status-with-corrupt-sequencer-state:
status: do not report errors in sequencer/todo
sequencer: factor out todo command name parsing
sequencer: always allow tab after command name
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions