projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ad5d893 9352fd5)
Merge branch 'ow/config-mailmap-pathname' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:45:55 +0000 (11:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:45:55 +0000 (11:45 -0700)
commitfbfdf13b5c0f168bbb292454d8099ca49dd7dbd6
treeb3a65890a8ba0d7b0ffdc640999136b7bc282574tree | snapshot
parentad5d8939078a50c247e259cdc1b6d615b233bf47commit | diff
parent9352fd570876ea0faf9f12251ecea06954fbe59bcommit | diff
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
config.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.