Merge branch 'pe/doc-email-env-is-trumped-by-config'
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)
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


Trivial merge