diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-28 11:12:31 -0800 |
| commit | a94214b75e2e763d27a85f91066ad90f291206fc (patch) | |
| tree | 346f0e62c52b936f231d62de562abbf61b93125b | |
| parent | c1640aa5d3696d8966b06689ac8746918453081e (diff) | |
| parent | be33414b186b3a7abbc1e37a0aa36b6b4d0d0e74 (diff) | |
| download | git-a94214b75e2e763d27a85f91066ad90f291206fc.tar.gz | |
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
| -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). |