From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jan 2013 19:12:31 +0000 (-0800)
Subject: Merge branch 'pe/doc-email-env-is-trumped-by-config' into maint
X-Git-Tag: v1.8.1.2~5
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/a94214b75e2e763d27a85f91066ad90f291206fc?hp=c1640aa5d3696d8966b06689ac8746918453081e

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

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 6d5a04c83b..a221169515 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -72,13 +72,13 @@ if set:
 	GIT_COMMITTER_NAME
 	GIT_COMMITTER_EMAIL
 	GIT_COMMITTER_DATE
-	EMAIL
 
 (nb "<", ">" and "\n"s are stripped)
 
 In case (some of) these environment variables are not set, the information
 is taken from the configuration items user.name and user.email, or, if not
-present, system user name and the hostname used for outgoing mail (taken
+present, the environment variable EMAIL, or, if that is not set,
+system user name and the hostname used for outgoing mail (taken
 from `/etc/mailname` and falling back to the fully qualified hostname when
 that file does not exist).