From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 4 May 2005 14:12:18 +0000 (-0700)
Subject: git-pull-script: add a final "diffstat" to show the result of the merge.
X-Git-Tag: v0.99~651
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=705acc5c943e1147e552daf613c679c07b9772d9;p=git.git

git-pull-script: add a final "diffstat" to show the result of the merge.

This is useful to verify that you got the right thing.
---

diff --git a/git-pull-script b/git-pull-script
index 4220e1873..9315426e7 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -54,3 +54,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me
 echo "Committed merge $result_commit"
 echo $result_commit > .git/HEAD
 git-checkout-cache -f -a && git-update-cache --refresh
+git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1