diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-06-16 16:22:55 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2022-06-16 16:22:55 -0400 |
| commit | 797fc250c7dd64550f2283bdc749eda7555e3fa3 (patch) | |
| tree | 24293cea445b68bd4a03e7906ff649a7f7c63781 /shazam-merge-template.example | |
| parent | 70bf7e4c8563576241e15fcea9380d491d7e5cd7 (diff) | |
| download | b4-797fc250c7dd64550f2283bdc749eda7555e3fa3.tar.gz | |
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 <konstantin@linuxfoundation.org>
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 |