X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve-script;h=186b234b24e2581c3db9864a751b7e6c9e837c56;hb=220a0b527bd6ecd30a9d6dfed22195c95e6f445a;hp=4fc7a6dce39cf3e1bed9d2fee99c2cc0aef36651;hpb=12dccc165400beae564d2357ce86c71937e5cdc0;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index 4fc7a6dc..186b234b 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -39,14 +39,13 @@ if [ "$common" == "$head" ]; then
 	echo "Destroying all noncommitted data!"
 	echo "Kill me within 3 seconds.."
 	sleep 3
-	git-read-tree -m $merge || exit 1
-	git-checkout-cache -f -u -a
+	git-read-tree -u -m $head $merge || exit 1
 	echo $merge > "$GIT_DIR"/HEAD
 	git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
 	exit 0
 fi
 echo "Trying to merge $merge into $head"
-git-read-tree -m $common $head $merge || exit 1
+git-read-tree -u -m $common $head $merge || exit 1
 merge_msg="Merge of $merge_repo"
 result_tree=$(git-write-tree  2> /dev/null)
 if [ $? -ne 0 ]; then
@@ -58,5 +57,4 @@ fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
-git-checkout-cache -f -u -a
 git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat