From 2a21a75afb0547fa0eed5f6caa32bd15e1a6a131 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 20 Jan 2009 11:14:11 +1100 Subject: [PATCH] combine the merge_msg* commands generate a bit more of the message --- merge_msg | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/merge_msg b/merge_msg index 573dded..ba04ef5 100755 --- a/merge_msg +++ b/merge_msg @@ -10,7 +10,16 @@ branch=${branch#quilt/} branch=${branch%%/*} contact=$(sed -n "/ $branch /s/ .*$//p" $control) +greeting=${contact%% *} +[ "${contact%,*}" = "${contact}" ] || greeting="all" -sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\ +file="$*" + +gitk --merge -- $file & +[ "$file" ] && gvim $file + +sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the tree&Body=Hi $greeting,%0A\ %0A\ -Today's linux-next merge of the $branch tree got a conflict in between commit (%22%22) from the tree and commit (%22%22) from the $branch tree." +Today's linux-next merge of the $branch tree got a conflict in $file between commit (%22%22) from the tree and commit (%22%22) from the $branch tree." + +exit 0 -- 2.39.2