summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2013-01-10 12:29:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-10 18:18:51 (GMT)
commitbe33414b186b3a7abbc1e37a0aa36b6b4d0d0e74 (patch)
treed11d6a3ee4f9ff61f7763fb1fd69f7c403517862
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-be33414b186b3a7abbc1e37a0aa36b6b4d0d0e74.zip
git-be33414b186b3a7abbc1e37a0aa36b6b4d0d0e74.tar.gz
git-be33414b186b3a7abbc1e37a0aa36b6b4d0d0e74.tar.bz2
git-commit-tree(1): correct description of defaults
The old phrasing indicated that the EMAIL environment variable takes precedence over the user.email configuration setting, but it is the other way around. Signed-off-by: Peter Eisentraut <peter@eisentraut.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-commit-tree.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 6d5a04c..a221169 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).