From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jun 2014 19:18:24 +0000 (-0700)
Subject: Merge branch 'ow/config-mailmap-pathname'
X-Git-Tag: v2.1.0-rc0~113
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c37d3269d92eedbdf405a6f196253d120e8e2721;p=git

Merge branch 'ow/config-mailmap-pathname'

mailmap.file configuration names a pathname, hence should honor
~/path and ~user/path as its value.

* ow/config-mailmap-pathname:
  config: respect '~' and '~user' in mailmap.file
---

c37d3269d92eedbdf405a6f196253d120e8e2721