summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 14:12:18 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-04 14:12:18 (GMT)
commit705acc5c943e1147e552daf613c679c07b9772d9 (patch)
tree95619db3af4d1d6c8c967e35cb2e4ad76927cfd5
parenta31c6d022e2435a514fcc8ca57f9995c4376a986 (diff)
downloadgit-705acc5c943e1147e552daf613c679c07b9772d9.zip
git-705acc5c943e1147e552daf613c679c07b9772d9.tar.gz
git-705acc5c943e1147e552daf613c679c07b9772d9.tar.bz2
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.
-rwxr-xr-xgit-pull-script1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-pull-script b/git-pull-script
index 4220e18..9315426 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