X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge.sh;h=8759c5a7e0f8748108d6eff005cde1e0893f3592;hb=290b1467a387a3e5306028f36118a52958fa36c5;hp=498c938c4507ccdc27f5a9e30e85f013a067c876;hpb=5bac4a671907604b5fb4e24ff682d5b0e8431931;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 498c938c4..8759c5a7e 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -292,9 +292,14 @@ f,*)
 	# Again the most common case of merging one remote.
 	echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
 	git-update-index --refresh 2>/dev/null
+	msg="Fast forward"
+	if test -n "$have_message"
+	then
+		msg="$msg (no commit created; -m option ignored)"
+	fi
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
-	finish "$new_head" "Fast forward"
+	finish "$new_head" "$msg" || exit
 	dropsave
 	exit 0
 	;;