From 705acc5c943e1147e552daf613c679c07b9772d9 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 4 May 2005 07:12:18 -0700 Subject: [PATCH] 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. --- git-pull-script | 1 + 1 file changed, 1 insertion(+) diff --git a/git-pull-script b/git-pull-script index 4220e187..9315426e 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 -- 2.11.0