diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:45:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 11:45:55 -0700 |
| commit | fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6 (patch) | |
| tree | b3a65890a8ba0d7b0ffdc640999136b7bc282574 /t/t7609-merge-co-error-msgs.sh | |
| parent | Merge branch 'as/pretty-truncate' into maint (diff) | |
| parent | config: respect '~' and '~user' in mailmap.file (diff) | |
| download | tgif-fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6.tar.xz | |
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
Diffstat (limited to 't/t7609-merge-co-error-msgs.sh')
0 files changed, 0 insertions, 0 deletions