Skip to content

Commit fcafb75

Browse files
avargitster
authored andcommitted
mailmap doc: start by mentioning the comment syntax
Mentioning the comment syntax and blank line support first is in line with how "git help config" describes its format. See b8936cf (config.txt grammar, typo, and asciidoc fixes, 2006-06-08) for the paragraph I'm copying & amending from its documentation. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 6646cca commit fcafb75

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/gitmailmap.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ canonical real names and email addresses.
2323
SYNTAX
2424
------
2525

26+
The '#' character begins a comment to the end of line, blank lines
27+
are ignored.
28+
2629
In the simple form, each line in the file consists of the canonical
2730
real name of an author, whitespace, and an email address used in the
2831
commit (enclosed by '<' and '>') to map to the name. For example:
@@ -94,8 +97,6 @@ Other Author <[email protected]> <[email protected]>
9497
9598
------------
9699

97-
Use hash '#' for comments that are either on their own line, or after
98-
the email address.
99100

100101

101102
SEE ALSO

0 commit comments

Comments
 (0)