aboutsummaryrefslogtreecommitdiff
path: root/shazam-merge-template.example
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-09-30 10:35:10 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-09-30 10:35:10 -0400
commit0f46d4c8bf35c7762e96271e7061d42e8dae79e4 (patch)
tree67525e61f5a0f42e37ebf34a9f082d40c75da2d7 /shazam-merge-template.example
parent9a81f80ee58f61d133391264a303f7f815404d4c (diff)
downloadb4-0f46d4c8bf35c7762e96271e7061d42e8dae79e4.tar.gz
shazam: implement custom merge message templates
Allow people to set up their own preferred merge templates, using the netdev standard as default. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Diffstat (limited to 'shazam-merge-template.example')
-rw-r--r--shazam-merge-template.example19
1 files changed, 19 insertions, 0 deletions
diff --git a/shazam-merge-template.example b/shazam-merge-template.example
new file mode 100644
index 0000000..ab735b4
--- /dev/null
+++ b/shazam-merge-template.example
@@ -0,0 +1,19 @@
+# Lines starting with '#' will be removed before invoking git-merge
+# This is the first line (title) of the merge
+# ${seriestitle}: will be a cleaned up subject of the cover
+# letter or the first patch in the series.
+# ${patch_or_series}: will say "patch" if a single patch or
+# "patch series" if more than one
+Merge ${patch_or_series} "${seriestitle}"
+
+${authorname} <${authoremail}> says:
+====================
+# This will be the entirety of the cover letter minus anything
+# below the "-- \n" signature line. You will almost certainly
+# want to edit it down to only include the relevant info.
+${coverletter}
+====================
+# This will contain a lore link to the patches in question
+Link: ${midurl}
+# git-merge will append any additional information here, depending
+# on the flags you used to invoke it (e.g. --log, --signoff, etc)