Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8

[git.git] / Documentation / git-commit-tree.txt

diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 0fdb82ee8697a53beab6defd4db9eca8840b1dd0..02133d5fc9a14df7f4fe24d97bdf9980e77f807a 100644 (file)
--- 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
 
 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
 
 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[]
 
 
 include::i18n.txt[]
 

+FILES
+-----
+/etc/mailname
+

 SEE ALSO
 --------
 linkgit:git-write-tree[1]
 SEE ALSO
 --------
 linkgit:git-write-tree[1]