diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-13 19:03:24 -0700 |
commit | 3022386fee01512c8a46bbad68fe32d4fabeba48 (patch) | |
tree | 162bf41a36a0fc5b63b618e42577d2430835fadb /Documentation | |
parent | Merge branch 'il/archive-err-signal' (diff) | |
parent | ident: do not retrieve default ident when unnecessary (diff) | |
download | tgif-3022386fee01512c8a46bbad68fe32d4fabeba48.tar.xz |
Merge branch 'jn/ident-from-etc-mailname'
* jn/ident-from-etc-mailname:
ident: do not retrieve default ident when unnecessary
ident: check /etc/mailname if email is unknown
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-commit-tree.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 0fdb82ee86..02133d5fc9 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -68,7 +68,9 @@ if set: 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 fully qualified hostname. +present, 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). A commit comment is read from stdin. If a changelog entry is not provided via "<" redirection, 'git commit-tree' will just wait @@ -90,6 +92,10 @@ Discussion include::i18n.txt[] +FILES +----- +/etc/mailname + SEE ALSO -------- linkgit:git-write-tree[1] |