From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Oct 2011 02:03:24 +0000 (-0700)
Subject: Merge branch 'jn/ident-from-etc-mailname'
X-Git-Tag: v1.7.8-rc0~76
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3022386fee01512c8a46bbad68fe32d4fabeba48?hp=-c

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
---

3022386fee01512c8a46bbad68fe32d4fabeba48
diff --combined Documentation/git-commit-tree.txt
index 0fdb82ee86,9ac30a3274..02133d5fc9
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@@ -8,7 -8,6 +8,7 @@@ git-commit-tree - Create a new commit o
  
  SYNOPSIS
  --------
 +[verse]
  'git commit-tree' <tree> [(-p <parent commit>)...] < changelog
  
  DESCRIPTION
@@@ -68,7 -67,9 +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 -91,10 +92,10 @@@ Discussio
  
  include::i18n.txt[]
  
+ FILES
+ -----
+ /etc/mailname
+ 
  SEE ALSO
  --------
  linkgit:git-write-tree[1]