> Quoting Michael S. Tsirkin <mst@xxxxxxxxxxxxxxxxxx>:
> Subject: [PATCH] have merge put FETCH_HEAD data in commit message
>
> 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?
OK, I since discovered git-fmt-merge-msg does all the necessary formatting,
so here's a better and smaller patch. Seems to work well for me.
Junio, could you apply this?
-------------------------
Make git-fetch <URL> && git-merge FETCH_HEAD produce same merge message
as git-pull <URL>
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxxxxxxxxxx>
---
diff --git a/git-merge.sh b/git-merge.sh
index 8759c5a..1e11593 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -108,6 +108,9 @@ 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
+ cat "$GIT_DIR/$remote"
else
echo "$rh commit '$remote'"
fi
--
MST
-
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