diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:12 -0700 |
| commit | 0d7f242110dc71666780a85fca14fbc8223879d4 (patch) | |
| tree | 3154b4ef00a4b665f7b1dc94be1fa313c8db58cd /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'jk/format-patch-multiline-header' (diff) | |
| parent | trace: give repo_setup trace its own key (diff) | |
| download | tgif-0d7f242110dc71666780a85fca14fbc8223879d4.tar.xz | |
Merge branch 'jk/trace-sifter'
* jk/trace-sifter:
trace: give repo_setup trace its own key
add packet tracing debug code
trace: add trace_strbuf
trace: factor out "do we want to trace" logic
trace: refactor to support multiple env variables
trace: add trace_vprintf
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions