Merge branch 'nd/traces'
commit8f0c843aab226225b8ef43e9b2e317bda5ea8f6d
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2013 23:02:28 +0000 (20 16:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2013 23:02:28 +0000 (20 16:02 -0700)
tree85ae7766a7068daafb39ce1088012f780303252a
parent01c0615dceb433a5498c7160d67f77a6cc9197bb
parent1dd278ce60294aa6b3119a469007949c6fde425a
Merge branch 'nd/traces'

* 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