git-pull-script: add a final "diffstat" to show the result of the merge.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 14:12:18 +0000 (07:12 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 4 May 2005 14:12:18 +0000 (07:12 -0700)
This is useful to verify that you got the right thing.

git-pull-script

index 4220e187321e21d18d84481c98c473fb45cca86b..9315426e7a79b4cb77852950764de317573de23e 100755 (executable)
@@ -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