summaryrefslogtreecommitdiff
path: root/shazam-merge-template.example
blob: ab735b4773be388ee00c5b74dc782af7afa5e6b0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
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)