diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-01-12 21:17:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-12 14:04:40 -0800 |
| commit | fcafb753829b5d2c73fe67becc073227feb4d7a3 (patch) | |
| tree | 5b2b8a772fa809f3f8ffcc5882878b76376e970f /Documentation/gitmailmap.txt | |
| parent | 6646cca8927c1c88a13e07bc14144cf5c12610f3 (diff) | |
| download | git-fcafb753829b5d2c73fe67becc073227feb4d7a3.tar.gz | |
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
b8936cf060 (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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitmailmap.txt')
| -rw-r--r-- | Documentation/gitmailmap.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt index e75eadde63..4e4677018b 100644 --- a/Documentation/gitmailmap.txt +++ b/Documentation/gitmailmap.txt @@ -23,6 +23,9 @@ canonical real names and email addresses. SYNTAX ------ +The '#' character begins a comment to the end of line, blank lines +are ignored. + In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example: @@ -94,8 +97,6 @@ Other Author <other@author.xx> <nick2@company.xx> Santa Claus <santa.claus@northpole.xx> <me@company.xx> ------------ -Use hash '#' for comments that are either on their own line, or after -the email address. SEE ALSO |