Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint
commita94214b75e2e763d27a85f91066ad90f291206fc
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:12:31 +0000 (28 11:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:12:31 +0000 (28 11:12 -0800)
tree346f0e62c52b936f231d62de562abbf61b93125b
parentc1640aa5d3696d8966b06689ac8746918453081e
parentbe33414b186b3a7abbc1e37a0aa36b6b4d0d0e74
Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint

* pe/doc-email-env-is-trumped-by-config:
  git-commit-tree(1): correct description of defaults