Apply the mailmap at HEAD to every ident

1 file changed, 13 insertions, 0 deletions

diff --git a/MANUAL.txt b/MANUAL.txt
index fc91125..aa581f0 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -235,6 +235,15 @@ enable-log-linecount::
 	and removed lines for each commit on the repository log page. Default
 	value: "0".
 
+enable-mailmap::
+	Flag which, when set to "1", applies the repository's mailmap to every
+	author, committer and tagger shown, so a person who changed name or
+	address appears under one identity in the log, commit, tag, blame and
+	statistics pages, the atom feed and the author search. Only the
+	.mailmap blob at HEAD is read, as git does for a bare repository, and
+	the mailmap.file and mailmap.blob settings are ignored. Default value:
+	"1". See also: "repo.enable-mailmap".
+
 enable-plain-email::
 	Flag which, when set to "0", hides the full author, committer and tagger
 	email addresses wherever they would be shown beside the name. Default
@@ -614,6 +623,10 @@ repo.enable-log-linecount::
 	A flag which can be used to override the global setting
 	"enable-log-linecount". Default value: <enable-log-linecount>.
 
+repo.enable-mailmap::
+	A flag which can be used to override the global setting
+	"enable-mailmap". Default value: <enable-mailmap>.
+
 repo.enable-remote-branches::
 	A flag which can be used to override the global setting
 	"enable-remote-branches". Default value: <enable-remote-branches>.