summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-25 11:45:55 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-25 11:45:55 -0700
commitfbfdf13b5c0f168bbb292454d8099ca49dd7dbd6 (patch)
treeb3a65890a8ba0d7b0ffdc640999136b7bc282574 /builtin/commit.c
parentad5d8939078a50c247e259cdc1b6d615b233bf47 (diff)
parent9352fd570876ea0faf9f12251ecea06954fbe59b (diff)
downloadgit-fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6.tar.gz
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions