diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:27:00 -0700 |
| commit | 51b8aecabed1363f13c990320a50e1fb2aa3f696 (patch) | |
| tree | 989a4699cd5d3e9a8a645ac67092e66ba62094d7 /builtin/merge-tree.c | |
| parent | Merge branch 'st/lib-gpg-kill-stray-agent' (diff) | |
| parent | convert: add "status=delayed" to filter process protocol (diff) | |
| download | tgif-51b8aecabed1363f13c990320a50e1fb2aa3f696.tar.xz | |
Merge branch 'ls/filter-process-delayed'
The filter-process interface learned to allow a process with long
latency give a "delayed" response.
* ls/filter-process-delayed:
convert: add "status=delayed" to filter process protocol
convert: refactor capabilities negotiation
convert: move multiple file filter error handling to separate function
convert: put the flags field before the flag itself for consistent style
t0021: write "OUT <size>" only on success
t0021: make debug log file name configurable
t0021: keep filter log files on comparison
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions