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

diff --cc Documentation/git.txt
Simple merge

diff --cc cache.h
Simple merge

diff --cc config.c
Simple merge

diff --cc sha1_file.c
Simple merge