Merge branch 'master' into next

diff --git a/git-merge.sh b/git-merge.sh
index 4609fe54d52843f42d2c1d18a9dc2ff235b5c7ce..cc0952a97db7d998a3f26e98b93cf2154887abd5 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -131,10 +131,10 @@ case "$#,$common,$no_commit" in
        ;;
 1,"$head",*)
        # Again the most common case of merging one remote.
-       echo "Updating from $head to $1."
+       echo "Updating from $head to $1"
        git-update-index --refresh 2>/dev/null
        new_head=$(git-rev-parse --verify "$1^0") &&
-       git-read-tree -u -m $head "$new_head" &&
+       git-read-tree -u -v -m $head "$new_head" &&
        finish "$new_head" "Fast forward"
        dropsave
        exit 0
@@ -150,7 +150,7 @@ case "$#,$common,$no_commit" in
 
        echo "Trying really trivial in-index merge..."
        git-update-index --refresh 2>/dev/null
-       if git-read-tree --trivial -m -u $common $head "$1" &&
+       if git-read-tree --trivial -m -u -v $common $head "$1" &&
           result_tree=$(git-write-tree)
        then
            echo "Wonderful."