summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 00:45:41 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 00:45:41 (GMT)
commit866b973b5d418622cbe28fea85169379dcb30f9d (patch)
treebcc1cf2e976011bcf20322db7d8ac4589bad6d5c
parent53d4b460858745949287d5bb51f5210b80d86305 (diff)
downloadgit-866b973b5d418622cbe28fea85169379dcb30f9d.zip
git-866b973b5d418622cbe28fea85169379dcb30f9d.tar.gz
git-866b973b5d418622cbe28fea85169379dcb30f9d.tar.bz2
git-resolve-script: use "git-apply --stat" instead of diffstat
Not everybody necessarily even has diffstat installed.
-rw-r--r--git-resolve-script4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-resolve-script b/git-resolve-script
index 5f1a748..b7ccc20 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