diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-01 12:40:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-01 12:40:05 -0800 |
| commit | a14daf8b9101225792341e4354699c5a2e30449a (patch) | |
| tree | 49be522d86a83d3887925beb7d76459df7311d00 /Documentation/merge-config.txt | |
| parent | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' (diff) | |
| parent | ident: do not drop username when reading from /etc/mailname (diff) | |
| download | tgif-a14daf8b9101225792341e4354699c5a2e30449a.tar.xz | |
Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname'
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. This is to fix it.
* jn/do-not-drop-username-when-reading-from-etc-mailname:
ident: do not drop username when reading from /etc/mailname
Diffstat (limited to 'Documentation/merge-config.txt')
0 files changed, 0 insertions, 0 deletions