From c8b48ba4767ff9da19ef4f41f8d870f11742d833 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Thu, 22 Sep 2005 00:55:22 -0700
Subject: Prettyprint octopus merge message.

Including the current branch in the list of heads being merged
was not a good idea, so drop it.  And shorten the message by
grouping branches and tags together to form a single line.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 git-pull.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'git-pull.sh')

diff --git a/git-pull.sh b/git-pull.sh
index 8cf39e7f64..e3d11961b0 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -25,10 +25,6 @@ then
 fi
 
 merge_head=$(sed -e 's/	.*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
-merge_name=$(
-    perl -e 'print join("; ", map { chomp; s/^[0-9a-f]*	//; $_ } <>)' \
-    "$GIT_DIR"/FETCH_HEAD
-)
 
 case "$merge_head" in
 '')
@@ -41,6 +37,5 @@ case "$merge_head" in
 	;;
 esac
 
-git-resolve \
-	"$(cat "$GIT_DIR"/HEAD)" \
-	$merge_head "Merge $merge_name"
+merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD")
+git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name"
-- 
cgit v1.2.3