From: Markus Heidelberg <markus.heidelberg@web.de>
To: Yann Dirson <ydirson@altern.org>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] Improve doc for format-patch threading options.
Date: Thu, 23 Jul 2009 07:31:13 +0200 [thread overview]
Message-ID: <200907230731.14430.markus.heidelberg@web.de> (raw)
In-Reply-To: <1248298771-21075-3-git-send-email-ydirson@altern.org>
Yann Dirson, 22.07.2009:
> This hopefully makes the relationship between threading options of
> format-patch and send-email easier to grasp.
Yes, it does.
> Signed-off-by: Yann Dirson <ydirson@altern.org>
> ---
> Documentation/git-format-patch.txt | 22 +++++++++++++++-------
> Documentation/git-send-email.txt | 21 ++++++++++++++++-----
> 2 files changed, 31 insertions(+), 12 deletions(-)
>
> diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
> index 6f1fc80..687e667 100644
> --- a/Documentation/git-format-patch.txt
> +++ b/Documentation/git-format-patch.txt
> @@ -10,7 +10,7 @@ SYNOPSIS
> --------
> [verse]
> 'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]
> - [--thread[=<style>]]
> + [--no-thread | --thread[=<style>]]
> [(--attach|--inline)[=<boundary>] | --no-attach]
> [-s | --signoff]
> [-n | --numbered | -N | --no-numbered]
> @@ -124,17 +124,25 @@ include::diff-options.txt[]
> second part, with "Content-Disposition: inline".
>
> --thread[=<style>]::
> - Add In-Reply-To and References headers to make the second and
> - subsequent mails appear as replies to the first. Also generates
> - the Message-Id header to reference.
> +--no-thread::
> + Controls addition of In-Reply-To and References headers to
> + make the second and subsequent mails appear as replies to the
> + first. Also controls generation of the Message-Id header to
> + reference.
> +
> The optional <style> argument can be either `shallow` or `deep`.
> 'shallow' threading makes every mail a reply to the head of the
> series, where the head is chosen from the cover letter, the
> `\--in-reply-to`, and the first patch mail, in this order. 'deep'
> -threading makes every mail a reply to the previous one. If not
> -specified, defaults to the 'format.thread' configuration, or `shallow`
> -if that is not set.
> +threading makes every mail a reply to the previous one.
> ++
> +The default is --no-thread, unless the 'format.thread' configuration
> +is set. If --thread is specified without a style, it defaults to the
> +style specified by 'format.thread' if any, or else `shallow`.
> ++
> +Beware that the default for 'git send-email' is to thread emails
> +itself. If you want 'git format-patch' to take care of hreading, you
^^^^^^^^
threading
I guess Junio can squash this in.
> +will want to ensure that threading is disabled for 'git send-email'.
>
> --in-reply-to=Message-Id::
> Make the first mail (or all the mails with --no-thread) appear as a
next prev parent reply other threads:[~2009-07-23 5:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-05 23:05 [WIP PATCH 0/2] format-patch / send-mail thrading documentation Yann Dirson
2009-07-05 23:05 ` [PATCH 1/2] List send-email config options in config.txt Yann Dirson
2009-07-05 23:05 ` [PATCH 2/2] Improve doc for format-patch threading options Yann Dirson
2009-07-06 8:36 ` Markus Heidelberg
2009-07-06 8:49 ` Markus Heidelberg
2009-07-16 22:23 ` Yann Dirson
2009-07-16 22:58 ` Markus Heidelberg
2009-07-17 6:52 ` Yann Dirson
2009-07-17 23:23 ` Markus Heidelberg
2009-07-22 20:57 ` Yann Dirson
2009-07-06 6:58 ` [PATCH 1/2] List send-email config options in config.txt Junio C Hamano
2009-07-16 21:20 ` Yann Dirson
2009-07-22 21:39 ` [PATCHv2 0/2] format-patch / send-mail threading documentation Yann Dirson
2009-07-22 21:39 ` [PATCH 1/2] List send-email config options in config.txt Yann Dirson
2009-07-22 21:39 ` [PATCH 2/2] Improve doc for format-patch threading options Yann Dirson
2009-07-23 5:31 ` Markus Heidelberg [this message]
2009-07-22 22:10 ` [PATCHv2 0/2] format-patch / send-mail threading documentation Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200907230731.14430.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ydirson@altern.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).