X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=cb094388bb5c830d37a790f5e7bbf13e8c61352a;hb=ba7545adab83e6bea43353937eabb467bcb7d4f7;hp=5b34b4de99c33a99dfb841795baced8889f74a88;hpb=1ad7a06adb6fbe42357daa58738008cbadbb8650;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4de9..cb094388b 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -93,6 +93,8 @@ finish () {
 	esac
 }
 
+case "$#" in 0) usage ;; esac
+
 rloga=
 while case "$#" in 0) break ;; esac
 do
@@ -197,7 +199,7 @@ f,*)
 	;;
 ?,1,"$head",*)
 	# Again the most common case of merging one remote.
-	echo "Updating from $head to $1"
+	echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -u -v -m $head "$new_head" &&