From 85295a52e683a24d8404c6989d8b8f134a0ea684 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Thu, 22 Mar 2007 11:07:30 +0200 Subject: [PATCH] git-merge: Put FETCH_HEAD data in merge commit message This makes git-fetch && git-merge FETCH_HEAD produce the same merge message as git-pull . Signed-off-by: Michael S. Tsirkin Signed-off-by: Junio C Hamano --- git-merge.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git-merge.sh b/git-merge.sh index 8759c5a7e0..fa4589173f 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 "$remote" = "FETCH_HEAD" -a -r "$GIT_DIR/FETCH_HEAD" + then + sed -e 's/ not-for-merge / /' -e 1q \ + "$GIT_DIR/FETCH_HEAD" else echo "$rh commit '$remote'" fi -- 2.11.4.GIT