Aditya Garg <gargaditya08@xxxxxxxx> writes: > Add an option to allow users to specifically enable or disable > retrieving the Message-ID from the Outlook SMTP server. This can be used > for other hosts mimicking the behaviour of Outlook, or for users who set > a custom domain to be a CNAME for the Outlook SMTP server. > > While at it, lets also add missing * in description of --no-smtp-auth. > > Helped-by: Junio C Hamano <gitster@xxxxxxxxx> > Signed-off-by: Aditya Garg <gargaditya08@xxxxxxxx> > --- > v2: Replace tab with spaces in "outlookidtweak" => \$outlook_id_tweak, > v3: Rename to --[no-]outlook-id-fix and make it bool. Also add missing > * in description of --no-smtp-auth. > v4: Improve documentation and the log message. Also, have the final > "return $outlook_id_fix;" on its own line. > > Documentation/git-send-email.adoc | 13 +++++++++++++ > git-send-email.perl | 14 ++++++++++++-- > 2 files changed, 25 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc > index 7f223db42d..7ccca16296 100644 > --- a/Documentation/git-send-email.adoc > +++ b/Documentation/git-send-email.adoc > @@ -115,6 +115,19 @@ illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`: > Only necessary if --compose is also set. If --compose > is not set, this will be prompted for. > > +--[no-]outlook-id-fix:: > + Microsoft Outlook SMTP servers discard the Message-ID sent via email and > + assign a new random Message-ID, thus breaking threads. > + > + With `--outlook-id-fix`, 'git send-email' uses a mechanism specific to > + Outlook servers to learn the Message-ID the server assigned to fix the > + threading. Use it only when you know that the server reports the > + rewritten Message-ID the same way as Outlook servers do. > + > + Without this option specified, the fix is done by default when talking > + to 'smtp.office365.com' or 'smtp-mail.outlook.com'. Use > + `--no-outlook-id-fix` to disable even when talking to these two servers. You'd need the usual "a line with only + on it as the paragraph separator, with subsequent paragraphs dedented" mark-up. I'll tweak this part on my end.
