From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 6 Jan 2013 07:41:42 +0000 (-0800)
Subject: Merge branch 'jk/mailmap-from-blob'
X-Git-Tag: v1.8.2-rc0~183
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a3100a889cab5d3a1a590258304dacd188a17f6;p=thirdparty%2Fgit.git

Merge branch 'jk/mailmap-from-blob'

Allow us to read, and default to read, mailmap files from the tip
of the history in bare repositories.  This will help running tools
like shortlog in server settings.

* jk/mailmap-from-blob:
  mailmap: default mailmap.blob in bare repositories
  mailmap: fix some documentation loose-ends for mailmap.blob
  mailmap: clean up read_mailmap error handling
  mailmap: support reading mailmap from blobs
  mailmap: refactor mailmap parsing for non-file sources
---

3a3100a889cab5d3a1a590258304dacd188a17f6