Merge branch 'ml/trace'

* ml/trace:
  test-lib: unset GIT_TRACE
  GIT_TRACE: fix a mixed declarations and code warning
  GIT_TRACE: show which built-in/external commands are executed

diff --cc Documentation/git.txt
Simple merge

diff --cc git.c
Simple merge

diff --cc t/test-lib.sh
Simple merge