From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Feb 2013 18:04:26 +0000 (-0800)
Subject: Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint
X-Git-Tag: v1.8.1.3~11
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/7f3d409cd18e74c1d3adf892dce70a2d02d0797a

Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint

We used to stuff "user@" and then append what we read from
/etc/mailname to come up with a default e-mail ident, but a bug lost
the "user@" part.

* jn/do-not-drop-username-when-reading-from-etc-mailname:
  ident: do not drop username when reading from /etc/mailname
---

7f3d409cd18e74c1d3adf892dce70a2d02d0797a