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.
This commit is contained in:
parent
a31c6d022e
commit
705acc5c94
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user