Merge branch 'jk/trace-sifter'
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:24:12 +0000 (23:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Mar 2011 06:24:12 +0000 (23:24 -0700)
* 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

1  2 
builtin/clone.c
builtin/fetch.c
builtin/push.c
builtin/receive-pack.c
cache.h

diff --cc builtin/clone.c
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/push.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge