Merge branch 'nd/traces' into next
commitce0d897296857eb673c89142b4f8572abebfa73d
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:50:57 +0000 (14 08:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Jun 2013 15:50:57 +0000 (14 08:50 -0700)
tree8ae9d6f28693a0e3e65fedef8f51218b20006eb8
parent99b6b54d2a3840a23bb1edfaedc4bc0a4afb3c97
parent1dd278ce60294aa6b3119a469007949c6fde425a
Merge branch 'nd/traces' into next

* nd/traces:
  git.txt: document GIT_TRACE_PACKET
  core: use env variable instead of config var to turn on logging pack access
Documentation/git.txt
cache.h
config.c
sha1_file.c