X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=cc0952a97db7d998a3f26e98b93cf2154887abd5;hb=84a9b58c421f9b2d1cc6c195ed441fac48e60392;hp=7be9e81f1f886c6e0b4c6be8758bd7ba25f5b04c;hpb=aa01568dc7277f189f003ab221fec3268e5ceb81;p=git.git diff --git a/git-merge.sh b/git-merge.sh index 7be9e81f..cc0952a9 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -131,7 +131,7 @@ 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 -v -m $head "$new_head" &&