diff options
Diffstat (limited to 'shazam-merge-template.example')
| -rw-r--r-- | shazam-merge-template.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shazam-merge-template.example b/shazam-merge-template.example index ab735b4..e4d49d2 100644 --- a/shazam-merge-template.example +++ b/shazam-merge-template.example @@ -7,12 +7,12 @@ 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} -==================== +${covermessage} + # This will contain a lore link to the patches in question Link: ${midurl} # git-merge will append any additional information here, depending |