GIT-VERSION-FILE: check ./version first.

[thirdparty/git.git] / git-resolve.sh
diff --git a/git-resolve.sh b/git-resolve.sh

index a7bc680d90cb503c50d25b15bcaba662c5f5b49e..36b90e38494eb79b4859cf59301b5a4e6ccccea1 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -5,6 +5,10 @@
  # Resolve two trees.
  #
  
+echo 'WARNING: This command is DEPRECATED and will be removed very soon.' >&2
+echo 'WARNING: Please use git-merge or git-pull instead.' >&2
+sleep 2
+
  USAGE='<head> <remote> <merge-message>'
  . git-sh-setup
  
@@ -42,7 +46,7 @@ case "$common" in
         exit 0
         ;;
  "$head")
-       echo "Updating from $head to $merge"
+       echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)"
         git-read-tree -u -m $head $merge || exit 1
         git-update-ref -m "resolve $merge_name: Fast forward" \
                 HEAD "$merge" "$head"