X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-resolve-script;h=b7ccc201145e543c493df79cccd2a6c9aa03e210;hb=000182eacf99cde27d5916aa415921924b82972c;hp=ec646fbb915d932cad66d8b4bd7457d844b7dd38;hpb=8ac069ac0ab34e751e5f96b0244a5fec10f3e54f;p=git.git

diff --git a/git-resolve-script b/git-resolve-script
index ec646fbb..b7ccc201 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -39,9 +39,9 @@ if [ "$common" == "$head" ]; then
 	echo "Destroying all noncommitted data!"
 	echo "Kill me within 3 seconds.."
 	sleep 3
-	git-read-tree -m $merge && git-checkout-cache -f -a && git-update-cache --refresh
+	git-read-tree -m $merge && git-checkout-cache -f -u -a
 	echo $merge > "$GIT_DIR"/HEAD
-	git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+	git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat
 	exit 0
 fi
 echo "Trying to merge $merge into $head"
@@ -57,5 +57,5 @@ 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 -a && git-update-cache --refresh
-git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+git-checkout-cache -f -u -a
+git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat