From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jun 2014 18:45:55 +0000 (-0700)
Subject: Merge branch 'ow/config-mailmap-pathname' into maint
X-Git-Tag: v2.0.1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6;p=git

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
---

fbfdf13b5c0f168bbb292454d8099ca49dd7dbd6