summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-05 12:30:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-05 12:30:09 -0700
commit88bad58d3860a8e0cf6499951e24311d15bc63f0 (patch)
treec9e325c9983e51b616090626ab436bef56c9731d /Documentation/merge-config.txt
parentMerge branch 'jh/quiltimport-explicit-series-file' (diff)
parentpkt-line: show packets in async processes as "sideband" (diff)
downloadtgif-88bad58d3860a8e0cf6499951e24311d15bc63f0.tar.xz
Merge branch 'jk/async-pkt-line'
The debugging infrastructure for pkt-line based communication has been improved to mark the side-band communication specifically. * jk/async-pkt-line: pkt-line: show packets in async processes as "sideband" run-command: provide in_async query function
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions