diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-25 18:24:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-25 18:24:52 -0700 |
| commit | 1522467d13a8fe29eb32209f175722df41e224b6 (patch) | |
| tree | e7cefbc5fa987e0953ea7c0af46a7605632ce191 | |
| parent | f92c61aef0190641e01294dad3b891b28113e1d5 (diff) | |
| parent | 7ffcbafbf32185da7dccb4b3f49b871f24ab58c4 (diff) | |
| download | git-1522467d13a8fe29eb32209f175722df41e224b6.tar.gz | |
Merge branch 'jk/sendemail-mailmap-doc'
Docfix.
* jk/sendemail-mailmap-doc:
send-email: document --mailmap and associated configuration
| -rw-r--r-- | Documentation/config/sendemail.txt | 15 | ||||
| -rw-r--r-- | Documentation/git-send-email.txt | 6 |
2 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt index 6a869d67eb..5ffcfc9f2a 100644 --- a/Documentation/config/sendemail.txt +++ b/Documentation/config/sendemail.txt @@ -30,6 +30,21 @@ sendemail.confirm:: in the linkgit:git-send-email[1] documentation for the meaning of these values. +sendemail.mailmap:: + If true, makes linkgit:git-send-email[1] assume `--mailmap`, + otherwise assume `--no-mailmap`. False by default. + +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: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:gitmailmap[5]. + sendemail.aliasesFile:: To avoid typing long email addresses, point this to one or more email aliases files. You must also supply `sendemail.aliasFileType`. diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 2e6f1d63ae..bc3ef45acb 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -414,6 +414,12 @@ exists when 'git send-email' is asked to add it (especially note that Failure to do so may not produce the expected result in the recipient's MUA. +--[no-]mailmap:: + 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 + values. Defaults to `sendemail.mailmap`. Administering ~~~~~~~~~~~~~ |