Skip to content

Commit 705acc5

Browse files
author
Linus Torvalds
committed
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.
1 parent a31c6d0 commit 705acc5

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-pull-script

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me
5454
echo "Committed merge $result_commit"
5555
echo $result_commit > .git/HEAD
5656
git-checkout-cache -f -a && git-update-cache --refresh
57+
git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1

0 commit comments

Comments
 (0)