Merge branch 'pe/doc-email-env-is-trumped-by-config'
commite928b70f8990156153d2ebcaea7454bbd6811279
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2013 19:19:33 +0000 (18 11:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Jan 2013 19:19:33 +0000 (18 11:19 -0800)
tree76c0d158c231ba46bd72e28291a8c42421f2d1a9
parent3a1bba7e3833b610c2bfa209dc00eeb1f215c434
parentbe33414b186b3a7abbc1e37a0aa36b6b4d0d0e74
Merge branch 'pe/doc-email-env-is-trumped-by-config'

In the precedence order, the environment variable $EMAIL comes
between the built-in default (i.e. taking value by asking the
system's gethostname() etc.) and the user.email configuration
variable; the documentation implied that it is stronger than the
configuration like $GIT_COMMITTER_EMAIL is, which is wrong.

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