path: root/Documentation/mailmap.txt
AgeCommit message (Collapse)Author
2013-01-06Merge branch 'jk/mailmap-from-blob'Junio C Hamano
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
2012-12-17Documentation: don't link to example mail addressesJohn Keeping
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 <>
2012-12-13mailmap: fix some documentation loose-ends for mailmap.blobJeff King
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 <>
2009-03-17Documentation: minor grammatical fixes in git-blame.txt.David J. Mellor
Signed-off-by: David J. Mellor <> Signed-off-by: Junio C Hamano <>
2009-02-08Move mailmap documentation into separate fileMarius Storm-Olsen
Include it directly from git-shortlog.txt, and refer to it from pretty-format.txt. Signed-off-by: Marius Storm-Olsen <> Signed-off-by: Junio C Hamano <>