From 35097d58f1c51bbdac531e592d7b753ae358afb2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 24 Sep 2024 14:43:16 -0700 Subject: [PATCH] SQUASH??? --- Documentation/config/sendemail.txt | 4 ++-- Documentation/git-send-email.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt index 14a58b3749e212..5ffcfc9f2a76f7 100644 --- a/Documentation/config/sendemail.txt +++ b/Documentation/config/sendemail.txt @@ -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 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index dc5b122bb8e6d9..bc3ef45acbd134 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -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