From d5422b0c0ba9948166115f1b178c34ee65fc3057 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 13 Dec 2012 08:08:12 -0500 Subject: mailmap: 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 Signed-off-by: Junio C Hamano --- Documentation/mailmap.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation/mailmap.txt') diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt index 288f04e70c..bb349c2db3 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. -- cgit v1.2.1 From f430ed8b9991769073bf3095702f8e8801b365fc Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sun, 16 Dec 2012 14:00:29 +0000 Subject: Documentation: don't link to example mail addresses Email addresses in documentation are converted into mailto: hyperlinks in the HTML output and footnotes in man pages. This isn't desirable for cases where the address is used as an example and is not valid. Particularly annoying is the example "jane@laptop.(none)" which appears in git-shortlog(1) as "jane@laptop[1].(none)", with note 1 saying: 1. jane@laptop mailto:jane@laptop Fix this by escaping these email addresses with a leading backslash, to prevent Asciidoc expanding them as inline macros. In the case of mailmap.txt, render the address monospaced so that it matches the block examples surrounding that paragraph. Helped-by: Jeff King Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- Documentation/mailmap.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/mailmap.txt') diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt index 288f04e70c..dd89fca3f8 100644 --- a/Documentation/mailmap.txt +++ b/Documentation/mailmap.txt @@ -46,7 +46,7 @@ Jane Doe Joe R. Developer ------------ -Note how there is no need for an entry for , because the +Note how there is no need for an entry for ``, because the real name of that author is already correct. Example 2: Your repository contains commits from the following -- cgit v1.2.1