From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 5 May 2005 09:21:42 +0000 (-0700)
Subject: git-pull-script: do the diffstat also for the fast-forward case
X-Git-Tag: v0.99~645
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4bea3b6926609b0cfb1319b1b2e9b2697629b13f;p=git.git

git-pull-script: do the diffstat also for the fast-forward case

This way you always see what the state change was.
---

diff --git a/git-pull-script b/git-pull-script
index e7e82f49d..44cb6d5a8 100755
--- a/git-pull-script
+++ b/git-pull-script
@@ -39,6 +39,7 @@ if [ "$common" == "$head" ]; then
 	sleep 3
 	git-read-tree -m $merge_tree && git-checkout-cache -f -a && git-update-cache --refresh
 	echo $merge_head > .git/HEAD
+	git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1
 	exit 0
 fi
 echo "Trying to merge $merge_head into $head"