Merge branch 'jh/trace2'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:56 +0000 (09:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:56 +0000 (09:59 +0900)
A more structured way to obtain execution trace has been added.

* jh/trace2:
trace2: add for_each macros to clang-format
trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
trace2:data: add subverb for rebase
trace2:data: add subverb to reset command
trace2:data: add subverb to checkout command
trace2:data: pack-objects: add trace2 regions
trace2:data: add trace2 instrumentation to index read/write
trace2:data: add trace2 hook classification
trace2:data: add trace2 transport child classification
trace2:data: add trace2 sub-process classification
trace2:data: add editor/pager child classification
trace2:data: add trace2 regions to wt-status
trace2: collect Windows-specific process information
trace2: create new combined trace facility
trace2: Documentation/technical/api-trace2.txt

1  2 
builtin/am.c
builtin/checkout.c
cache.h
config.c
read-cache.c
sequencer.c
diff --cc builtin/am.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc sequencer.c
Simple merge