From 797fc250c7dd64550f2283bdc749eda7555e3fa3 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Thu, 16 Jun 2022 16:22:55 -0400 Subject: Implement "b4 shazam -M" that execs git-merge In addition to just being able to fetch a series into FETCH_HEAD, also add an option to exec git-merge automatically so that people don't have to cut-and-paste the merge command to use with paths to the cover letter. Signed-off-by: Konstantin Ryabitsev --- shazam-merge-template.example | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'shazam-merge-template.example') 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 -- cgit v1.2.3