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@xxxxxxxxxxxxxxxxxx>
---
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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html