Skip to content

Commit

Permalink
git-pull-script: add a final "diffstat" to show the result of the merge.
Browse files Browse the repository at this point in the history
This is useful to verify that you got the right thing.
  • Loading branch information
Linus Torvalds committed May 4, 2005
1 parent a31c6d0 commit 705acc5
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-pull-script
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 705acc5

Please sign in to comment.