Big tool rename.

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

similarity index 91%

rename from git-resolve-script

rename to git-resolve.sh

index 000cbb85e3ffd4be739ce0791d1afa59832aa734..1f559d8cb91bf88e7ddc0abad55db7ad4550aeef 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve.sh
@@ -4,10 +4,10 @@
  #
  # Resolve two trees.
  #
-. git-sh-setup-script || die "Not a git archive"
+. git-sh-setup || die "Not a git archive"
  
  usage () {
-       die "git-resolve-script <head> <remote> <merge-message>"
+       die "git-resolve <head> <remote> <merge-message>"
  }
  
  dropheads() {
@@ -85,12 +85,12 @@ case "$common" in
  esac
  
  echo "Trying to merge $merge into $head using $common."
-git-update-cache --refresh 2>/dev/null
+git-update-index --refresh 2>/dev/null
  git-read-tree -u -m $common $head $merge || exit 1
  result_tree=$(git-write-tree  2> /dev/null)
  if [ $? -ne 0 ]; then
         echo "Simple merge failed, trying Automatic merge"
-       git-merge-cache -o git-merge-one-file-script -a
+       git-merge-index -o git-merge-one-file -a
         if [ $? -ne 0 ]; then
                 echo $merge > "$GIT_DIR"/MERGE_HEAD
                 die "Automatic merge failed, fix up by hand"