diff options
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 5b34b4de99..cb094388bb 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" && |