diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-18 11:19:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-18 11:19:33 -0800 |
| commit | e928b70f8990156153d2ebcaea7454bbd6811279 (patch) | |
| tree | 76c0d158c231ba46bd72e28291a8c42421f2d1a9 /Documentation | |
| parent | Merge branch 'mk/complete-tcsh' (diff) | |
| parent | git-commit-tree(1): correct description of defaults (diff) | |
| download | tgif-e928b70f8990156153d2ebcaea7454bbd6811279.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-commit-tree.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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). |