Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-pull-script: do the diffstat also for the fast-forward case
[gitweb.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index e7e82f49d2a243060dfc653dad200675f8336688..44cb6d5a80e7259dc8f73a0770eb153b057f7371 100755
(executable)
--- 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"