Skip to content

Commit

Permalink
SQUASH???
Browse files Browse the repository at this point in the history
  • Loading branch information
gitster committed Sep 24, 2024
1 parent 67c46a4 commit 35097d5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Documentation/config/sendemail.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ sendemail.mailmap.file::
The location of a linkgit:git-send-email[1] specific augmenting
mailmap file. The default mailmap and `mailmap.file` are loaded
first. Thus, entries in this file take precedence over entries in
the default mailmap locations. See linkgit:git-mailmap[1].
the default mailmap locations. See linkgit:gitmailmap[5].

sendemail.mailmap.blob::
Like `sendemail.mailmap.file`, but consider the value as a reference
to a blob in the repository. Entries in `sendemail.mailmap.file`
take precedence over entries here. See linkgit:git-mailmap[1].
take precedence over entries here. See linkgit:gitmailmap[5].

sendemail.aliasesFile::
To avoid typing long email addresses, point this to one or more
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-send-email.txt
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ Failure to do so may not produce the expected result in the
recipient's MUA.

--[no-]mailmap::
Use the mailmap file (see linkgit:git-mailmap[1]) to map all
Use the mailmap file (see linkgit:gitmailmap[5]) to map all
addresses to their canonical real name and email address. Additional
mailmap data specific to git-send-email may be provided using the
`sendemail.mailmap.file` or `sendemail.mailmap.blob` configuration
Expand Down

0 comments on commit 35097d5

Please sign in to comment.