all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Kyle Meyer <kyle@kyleam.com>
To: Maxime Devos <maximedevos@telenet.be>
Cc: "Ludovic Courtès" <ludo@gnu.org>,
	57598@debbugs.gnu.org, guix-maintainers@gnu.org
Subject: [bug#57598] [PATCH] doc: Update contribution guidelines on patches, etc.
Date: Sun, 25 Sep 2022 14:58:50 -0400	[thread overview]
Message-ID: <87pmfj1dsl.fsf@kyleam.com> (raw)
In-Reply-To: <66417bb1-f81e-b2e6-6f37-c5dc9bb39dc9@telenet.be>

Maxime Devos writes:

> On 24-09-2022 15:03, Ludovic Courtès wrote:
[...]
>> You can write comments below the --- and diffstats.  That way, ‘git am’
>> will ignore them when applying the patch.
>
> I know of '---', but AFAICT this is undocumented behaviour, so I'm 
> hesitant to rely on that.

I don't think you should be worried about Git changing that behavior.
It's used heavily by the Git project itself as well as many other
projects.

Here are some mentions in git.git (4fd6c5e444):

,----[ Documentation/SubmittingPatches ]
| You often want to add additional explanation about the patch,
| other than the commit message itself.  Place such "cover letter"
| material between the three-dash line and the diffstat.  For
| patches requiring multiple iterations of review and discussion,
| an explanation of changes between each iteration can be kept in
| Git-notes and inserted automatically following the three-dash
| line via `git format-patch --notes`.
`----

,----[ Documentation/git-notes.txt ]
| Notes can also be added to patches prepared with `git format-patch` by
| using the `--notes` option. Such notes are added as a patch commentary
| after a three dash separator line.
`----

,----[ Documentation/user-manual.txt ]
| `git format-patch` can include an initial "cover letter". You can insert
| commentary on individual patches after the three dash line which
| `format-patch` places after the commit message but before the patch
| itself.  If you use `git notes` to track your cover letter material,
| `git format-patch --notes` will include the commit's notes in a similar
| manner.
`----

,----[ Documentation/git-format-patch.txt ]
| Typically it will be placed in a MUA's drafts folder, edited to add
| timely commentary that should not go in the changelog after the three
| dashes, and then sent as a message whose body, in our example, starts
| with "arch/arm config files were...".  On the receiving end, readers [...]
`----




  reply	other threads:[~2022-09-25 18:59 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-05 16:00 [bug#57598] [PATCH] doc: Update contribution guidelines on patches, etc Maxime Devos
2022-08-06  6:55 ` [bug#57598] [alternative PATCH] " Liliana Marie Prikler
2022-09-05 16:04 ` [bug#57598] [PATCH] " Maxime Devos
2022-09-06 11:33 ` Liliana Marie Prikler
2022-09-06 20:21   ` Maxime Devos
2022-09-07  8:09     ` Liliana Marie Prikler
2022-09-08 11:12       ` Maxime Devos
2022-09-09  8:04         ` Liliana Marie Prikler
2022-09-09 11:14           ` Maxime Devos
2022-09-09 13:32             ` Liliana Marie Prikler
2022-09-09 18:44               ` Maxime Devos
2022-09-09 20:09                 ` Liliana Marie Prikler
2022-09-09 12:30 ` [bug#57598] [PATCH v2] " Maxime Devos
2022-09-24 13:03   ` [bug#57598] [PATCH] " Ludovic Courtès
2022-09-25 17:59     ` Maxime Devos
2022-09-25 18:58       ` Kyle Meyer [this message]
2022-09-26  0:47     ` Maxim Cournoyer
2022-11-04 16:07   ` zimoun
2023-10-13 14:14 ` Maxime Devos
2023-10-13 14:22 ` Maxime Devos

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87pmfj1dsl.fsf@kyleam.com \
    --to=kyle@kyleam.com \
    --cc=57598@debbugs.gnu.org \
    --cc=guix-maintainers@gnu.org \
    --cc=ludo@gnu.org \
    --cc=maximedevos@telenet.be \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.