| commit | 3a3100a889cab5d3a1a590258304dacd188a17f6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 6 Jan 2013 07:41:42 +0000 (5 23:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 6 Jan 2013 07:41:42 +0000 (5 23:41 -0800) | ||
| tree | 7a8344350e0c69b20a41e07d3679a9d4813db83a | treesnapshot (tar.gz zip) |
| parent | 245d6d006408898613cdad35700d456e5d265722 | commitdiff |
| parent | 8c473cecfd8835c2bdf34b323e1b2de620099c04 | commitdiff |
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
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
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| Documentation/mailmap.txt | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |