From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 31 May 2005 00:45:41 +0000 (-0700)
Subject: git-resolve-script: use "git-apply --stat" instead of diffstat
X-Git-Tag: v0.99~409
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=866b973b5d418622cbe28fea85169379dcb30f9d;p=git.git

git-resolve-script: use "git-apply --stat" instead of diffstat

Not everybody necessarily even has diffstat installed.
---

diff --git a/git-resolve-script b/git-resolve-script
index 5f1a748c..b7ccc201 100644
--- a/git-resolve-script
+++ b/git-resolve-script
@@ -41,7 +41,7 @@ if [ "$common" == "$head" ]; then
 	sleep 3
 	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"
@@ -58,4 +58,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me
 echo "Committed merge $result_commit"
 echo $result_commit > "$GIT_DIR"/HEAD
 git-checkout-cache -f -u -a
-git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
+git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat