diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-14 06:03:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-14 06:03:24 +0400 |
| commit | 3022386fee01512c8a46bbad68fe32d4fabeba48 (patch) | |
| tree | 162bf41a36a0fc5b63b618e42577d2430835fadb /git-merge-one-file.sh | |
| parent | 1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b (diff) | |
| parent | d855e4d35de214e651a62909de96d54915273665 (diff) | |
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions