summaryrefslogtreecommitdiff
path: root/Documentation/mailmap.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 07:41:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-06 07:41:42 (GMT)
commit3a3100a889cab5d3a1a590258304dacd188a17f6 (patch)
tree7a8344350e0c69b20a41e07d3679a9d4813db83a /Documentation/mailmap.txt
parent245d6d006408898613cdad35700d456e5d265722 (diff)
parent8c473cecfd8835c2bdf34b323e1b2de620099c04 (diff)
downloadgit-3a3100a889cab5d3a1a590258304dacd188a17f6.zip
git-3a3100a889cab5d3a1a590258304dacd188a17f6.tar.gz
git-3a3100a889cab5d3a1a590258304dacd188a17f6.tar.bz2
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 'Documentation/mailmap.txt')
-rw-r--r--Documentation/mailmap.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
index dd89fca..4a8c276 100644
--- a/Documentation/mailmap.txt
+++ b/Documentation/mailmap.txt
@@ -1,5 +1,6 @@
If the file `.mailmap` exists at the toplevel of the repository, or at
-the location pointed to by the mailmap.file configuration option, it
+the location pointed to by the mailmap.file or mailmap.blob
+configuration options, it
is used to map author and committer names and email addresses to
canonical real names and email addresses.