From: Michael S. Tsirkin <mst@dev.mellanox.co.il>
Date: Wed, 21 Mar 2007 12:06:43 GMT
Subject: [PATCH] have merge put FETCH_HEAD data in commit message
Message-ID: <20070321120643.GI20583@mellanox.co.il>

Hi!
I often like to fetch some code from others, review and
then merge. So:

git fetch <URL>
git log -p FETCH_HEAD
git merge FETCH_HEAD

which is all good but gets me this message in commit log:

    Merge commit 'FETCH_HEAD' into master

which is not very informative.
I can always fix this up with git commit --amend, but
I'd like to avoid the extra step.

Would the following patch be appropriate?

Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il>

---

diff --git a/git-merge.sh b/git-merge.sh
index 8759c5a..629611b 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -108,6 +108,10 @@ merge_name () {
 		git-show-ref -q --verify "refs/heads/$truname" 2>/dev/null
 	then
 		echo "$rh		branch '$truname' (early part) of ."
+	elif test -r "$GIT_DIR/$remote"
+	then
+		echo -n "$rh		"
+		grep -v not-for-merge "$GIT_DIR/$remote"
 	else
 		echo "$rh		commit '$remote'"
 	fi