{"thread":{"id":"62180","subject":"[PATCH] send-email: document --mailmap and associated configuration","startedAt":"2024-09-23T22:24:34Z","lastAt":"2024-09-24T23:23:21Z","messageCount":6,"participants":["Jacob Keller","Junio C Hamano","Keller, Jacob E"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"503293","messageId":"20240923222429.4102405-1-jacob.e.keller@intel.com","threadId":"62180","inReplyTo":null,"subject":"[PATCH] send-email: document --mailmap and associated configuration","fromName":"Jacob Keller","fromEmail":"jacob.e.keller@intel.com","sentAt":"2024-09-23T22:24:28Z","receivedAt":"2024-09-23T22:24:34Z","isPatch":true,"sender":{"key":"jacob.e.keller@intel.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"From: Jacob Keller <jacob.keller@gmail.com>\n\n241499aba007 (\"send-email: add mailmap support via sendemail.mailmap and\n--mailmap\", 2024-08-27) added support for --mailmap, and the associated\nsendemail.mailmap.* configuration variables. Add documentation to\nreflect this feature.\n\nFixes: 241499aba007 (\"send-email: add mailmap support via sendemail.mailmap and --mailmap\")\nSigned-off-by: Jacob Keller <jacob.keller@gmail.com>\n---\n Documentation/config/sendemail.txt | 15 +++++++++++++++\n Documentation/git-send-email.txt   |  6 ++++++\n 2 files changed, 21 insertions(+)\n\ndiff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt\nindex 6a869d67eb90..14a58b3749e2 100644\n--- a/Documentation/config/sendemail.txt\n+++ b/Documentation/config/sendemail.txt\n@@ -30,6 +30,21 @@ sendemail.confirm::\n \tin the linkgit:git-send-email[1] documentation for the meaning of these\n \tvalues.\n \n+sendemail.mailmap::\n+\tIf true, makes linkgit:git-send-email[1] assume `--mailmap`,\n+\totherwise assume `--no-mailmap`. False by default.\n+\n+sendemail.mailmap.file::\n+\tThe location of a linkgit:git-send-email[1] specific augmenting\n+\tmailmap file. The default mailmap and `mailmap.file` are loaded\n+\tfirst. Thus, entries in this file take precedence over entries in\n+\tthe default mailmap locations. See linkgit:git-mailmap[1].\n+\n+sendemail.mailmap.blob::\n+\tLike `sendemail.mailmap.file`, but consider the value as a reference\n+\tto a blob in the repository. Entries in `sendemail.mailmap.file`\n+\ttake precedence over entries here. See linkgit:git-mailmap[1].\n+\n sendemail.aliasesFile::\n \tTo avoid typing long email addresses, point this to one or more\n \temail aliases files.  You must also supply `sendemail.aliasFileType`.\ndiff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt\nindex 2e6f1d63ae4a..dc5b122bb8e6 100644\n--- a/Documentation/git-send-email.txt\n+++ b/Documentation/git-send-email.txt\n@@ -414,6 +414,12 @@ exists when 'git send-email' is asked to add it (especially note that\n Failure to do so may not produce the expected result in the\n recipient's MUA.\n \n+--[no-]mailmap::\n+\tUse the mailmap file (see linkgit:git-mailmap[1]) to map all\n+\taddresses to their canonical real name and email address. Additional\n+\tmailmap data specific to git-send-email may be provided using the\n+\t`sendemail.mailmap.file` or `sendemail.mailmap.blob` configuration\n+\tvalues. Defaults to `sendemail.mailmap`.\n \n Administering\n ~~~~~~~~~~~~~\n-- \n2.46.2.828.g9e56e24342b6\n\n"},{"id":"503297","messageId":"xmqqo74dwrf3.fsf@gitster.g","threadId":"62180","inReplyTo":"20240923222429.4102405-1-jacob.e.keller@intel.com","subject":"Re: [PATCH] send-email: document --mailmap and associated configuration","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-09-24T05:29:20Z","receivedAt":"2024-09-24T05:29:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jacob Keller <jacob.e.keller@intel.com> writes:\n\n> From: Jacob Keller <jacob.keller@gmail.com>\n>\n> 241499aba007 (\"send-email: add mailmap support via sendemail.mailmap and\n> --mailmap\", 2024-08-27) added support for --mailmap, and the associated\n> sendemail.mailmap.* configuration variables. Add documentation to\n> reflect this feature.\n\nMakes sense.  Thanks.  Will queue.\n"},{"id":"503404","messageId":"xmqqr098rap4.fsf@gitster.g","threadId":"62180","inReplyTo":"20240923222429.4102405-1-jacob.e.keller@intel.com","subject":"Re: [PATCH] send-email: document --mailmap and associated configuration","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-09-24T21:41:43Z","receivedAt":"2024-09-24T21:41:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jacob Keller <jacob.e.keller@intel.com> writes:\n\n> +sendemail.mailmap.blob::\n> +\tLike `sendemail.mailmap.file`, but consider the value as a reference\n> +\tto a blob in the repository. Entries in `sendemail.mailmap.file`\n> +\ttake precedence over entries here. See linkgit:git-mailmap[1].\n\nNo such documentation page git-mailmap[1] exists, hence this breaks\n\"make check-docs\".\n\n\n\n"},{"id":"503405","messageId":"xmqqmsjwraj3.fsf@gitster.g","threadId":"62180","inReplyTo":"xmqqr098rap4.fsf@gitster.g","subject":"Re: [PATCH] send-email: document --mailmap and associated configuration","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-09-24T21:45:20Z","receivedAt":"2024-09-24T21:45:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Jacob Keller <jacob.e.keller@intel.com> writes:\n>\n>> +sendemail.mailmap.blob::\n>> +\tLike `sendemail.mailmap.file`, but consider the value as a reference\n>> +\tto a blob in the repository. Entries in `sendemail.mailmap.file`\n>> +\ttake precedence over entries here. See linkgit:git-mailmap[1].\n>\n> No such documentation page git-mailmap[1] exists, hence this breaks\n> \"make check-docs\".\n\nIOW linkgit:git-mailmap[1] -> linkgit:gitmailmap[5] everywhere.  I\ndid that while requeuing and reintegrating 'seen' for today's\npushout, so unless there are other things to be updated, no need to\nresend.\n\nThanks.\n"},{"id":"503450","messageId":"CO1PR11MB5089016E24E7142587E3478DD6682@CO1PR11MB5089.namprd11.prod.outlook.com","threadId":"62180","inReplyTo":"xmqqmsjwraj3.fsf@gitster.g","subject":"RE: [PATCH] send-email: document --mailmap and associated configuration","fromName":"Keller, Jacob E","fromEmail":"jacob.e.keller@intel.com","sentAt":"2024-09-24T23:15:33Z","receivedAt":"2024-09-24T23:15:44Z","isPatch":true,"sender":{"key":"jacob.e.keller@intel.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"\n\n> -----Original Message-----\n> From: Junio C Hamano <gitster@pobox.com>\n> Sent: Tuesday, September 24, 2024 2:45 PM\n> To: Keller, Jacob E <jacob.e.keller@intel.com>\n> Cc: git@vger.kernel.org; Jacob Keller <jacob.keller@gmail.com>\n> Subject: Re: [PATCH] send-email: document --mailmap and associated\n> configuration\n> \n> Junio C Hamano <gitster@pobox.com> writes:\n> \n> > Jacob Keller <jacob.e.keller@intel.com> writes:\n> >\n> >> +sendemail.mailmap.blob::\n> >> +\tLike `sendemail.mailmap.file`, but consider the value as a reference\n> >> +\tto a blob in the repository. Entries in `sendemail.mailmap.file`\n> >> +\ttake precedence over entries here. See linkgit:git-mailmap[1].\n> >\n> > No such documentation page git-mailmap[1] exists, hence this breaks\n> > \"make check-docs\".\n> \n> IOW linkgit:git-mailmap[1] -> linkgit:gitmailmap[5] everywhere.  I\n> did that while requeuing and reintegrating 'seen' for today's\n> pushout, so unless there are other things to be updated, no need to\n> resend.\n> \n> Thanks.\n\nAh, yes. Thanks for fixing!\n"},{"id":"503451","messageId":"xmqqikukr5zt.fsf@gitster.g","threadId":"62180","inReplyTo":"CO1PR11MB5089016E24E7142587E3478DD6682@CO1PR11MB5089.namprd11.prod.outlook.com","subject":"Re: [PATCH] send-email: document --mailmap and associated configuration","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-09-24T23:23:18Z","receivedAt":"2024-09-24T23:23:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Keller, Jacob E\" <jacob.e.keller@intel.com> writes:\n\n>> -----Original Message-----\n>> From: Junio C Hamano <gitster@pobox.com>\n>> Sent: Tuesday, September 24, 2024 2:45 PM\n>> To: Keller, Jacob E <jacob.e.keller@intel.com>\n>> Cc: git@vger.kernel.org; Jacob Keller <jacob.keller@gmail.com>\n>> Subject: Re: [PATCH] send-email: document --mailmap and associated\n>> configuration\n>> \n>> Junio C Hamano <gitster@pobox.com> writes:\n>> \n>> > Jacob Keller <jacob.e.keller@intel.com> writes:\n>> >\n>> >> +sendemail.mailmap.blob::\n>> >> +\tLike `sendemail.mailmap.file`, but consider the value as a reference\n>> >> +\tto a blob in the repository. Entries in `sendemail.mailmap.file`\n>> >> +\ttake precedence over entries here. See linkgit:git-mailmap[1].\n>> >\n>> > No such documentation page git-mailmap[1] exists, hence this breaks\n>> > \"make check-docs\".\n>> \n>> IOW linkgit:git-mailmap[1] -> linkgit:gitmailmap[5] everywhere.  I\n>> did that while requeuing and reintegrating 'seen' for today's\n>> pushout, so unless there are other things to be updated, no need to\n>> resend.\n>> \n>> Thanks.\n>\n> Ah, yes. Thanks for fixing!\n\nThanks for updating the documentation.\n"}]}