From 3ba513c32e7b9102187d94d1c43f33d9559fb334 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 8 Jul 2005 17:38:44 -0700
Subject: Make "git resolve" take the merge message in $3

It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.

This makes the third argument to "git resolve" much easier to explain.
---
 git-pull-script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-pull-script')

diff --git a/git-pull-script b/git-pull-script
index 0ef6be354..8e309fc98 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -22,4 +22,4 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1
 git-resolve-script \
 	"$(cat "$GIT_DIR"/HEAD)" \
 	"$(cat "$GIT_DIR"/FETCH_HEAD)" \
-	"$merge_name"
+	"Merge $merge_name"
-- 
cgit v1.2.1