| commit | fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:45:55 +0000 (25 11:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 18:45:55 +0000 (25 11:45 -0700) | ||
| tree | b3a65890a8ba0d7b0ffdc640999136b7bc282574 | treesnapshot (tar.gz zip) |
| parent | ad5d8939078a50c247e259cdc1b6d615b233bf47 | commitdiff |
| parent | 9352fd570876ea0faf9f12251ecea06954fbe59b | commitdiff |
Merge branch 'ow/config-mailmap-pathname' into maint
The "mailmap.file" configuration option did not support the tilde
expansion (i.e. ~user/path and ~/path).
* ow/config-mailmap-pathname:
config: respect '~' and '~user' in mailmap.file
The "mailmap.file" configuration option did not support the tilde
expansion (i.e. ~user/path and ~/path).
* ow/config-mailmap-pathname:
config: respect '~' and '~user' in mailmap.file
| config.c | diff1 | diff2 | blobhistory |