summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0d0d0b)
raw | patch | inline | side by side (parent: d0d0d0b)
author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Thu, 5 May 2005 09:21:42 +0000 (02:21 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Thu, 5 May 2005 09:21:42 +0000 (02:21 -0700) |
This way you always see what the state change was.
git-pull-script | patch | blob | history |
diff --git a/git-pull-script b/git-pull-script
index e7e82f49d2a243060dfc653dad200675f8336688..44cb6d5a80e7259dc8f73a0770eb153b057f7371 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
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"