From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Jan 2013 19:19:33 +0000 (-0800)
Subject: Merge branch 'pe/doc-email-env-is-trumped-by-config'
X-Git-Tag: v1.8.2-rc0~121
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/e928b70f8990156153d2ebcaea7454bbd6811279

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
---

e928b70f8990156153d2ebcaea7454bbd6811279