diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:41:42 -0800 |
| commit | 3a3100a889cab5d3a1a590258304dacd188a17f6 (patch) | |
| tree | 7a8344350e0c69b20a41e07d3679a9d4813db83a /.gitattributes | |
| parent | Merge branch 'jc/fetch-ignore-symref' (diff) | |
| parent | mailmap: default mailmap.blob in bare repositories (diff) | |
| download | tgif-3a3100a889cab5d3a1a590258304dacd188a17f6.tar.xz | |
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
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions