summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-12 11:38:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-12 11:38:55 -0800
commite20d5a2c4433daf09797d9e4e9f6c4eaedec86dd (patch)
tree69234204ad84335a8f5ec5fc1b857b014ac10126 /Documentation
parentMerge branch 'rs/simplify-transport-get' (diff)
parentSubmittingPatches: explain rationale for using --notes with format-patch (diff)
downloadtgif-e20d5a2c4433daf09797d9e4e9f6c4eaedec86dd.tar.xz
Merge branch 'sb/doc-submitting-patches-keep-notes'
* sb/doc-submitting-patches-keep-notes: SubmittingPatches: explain rationale for using --notes with format-patch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/SubmittingPatches7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 16d5d2be08..ef0eeb40cd 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -176,8 +176,11 @@ message starts, you can put a "From: " line to name that person.
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 lines and the diffstat. Git-notes
-can also be inserted using the `--notes` option.
+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`.
Do not attach the patch as a MIME attachment, compressed or not.
Do not let your e-mail client send quoted-printable. Do not let