On Wed, Dec 12, 2012 at 06:04:04AM -0500, Jeff King wrote: > In a bare repository, there isn't a simple way to respect an > in-tree mailmap without extracting it to a temporary file. > This patch provides a config variable, similar to > mailmap.file, which reads the mailmap from a blob in the > repository. While preparing the "default mailmap.blob" patch, I noticed a few loose ends in the documentation. They can be squashed into this 2/2 (jk/mailmap-from-blob~1), or can go on top of the series: -- >8 -- Subject: [PATCH] fix some documentation loose-ends for mailmap.blob Anywhere we mention mailmap.file, it is probably worth mentioning mailmap.blob, as well. Signed-off-by: Jeff King <peff@xxxxxxxx> --- Documentation/git-log.txt | 2 +- Documentation/mailmap.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 585dac4..08a185d 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -167,7 +167,7 @@ log.showroot:: `git log -p` output would be shown without a diff attached. The default is `true`. -mailmap.file:: +mailmap.*:: See linkgit:git-shortlog[1]. notes.displayRef:: diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt index 288f04e..bb349c2 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 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. -- 1.8.0.2.4.g59402aa -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html