diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:12:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:12:18 -0700 |
| commit | 705acc5c943e1147e552daf613c679c07b9772d9 (patch) | |
| tree | 95619db3af4d1d6c8c967e35cb2e4ad76927cfd5 | |
| parent | a31c6d022e2435a514fcc8ca57f9995c4376a986 (diff) | |
| download | git-705acc5c943e1147e552daf613c679c07b9772d9.tar.gz | |
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-x | git-pull-script | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-pull-script b/git-pull-script index 4220e18732..9315426e7a 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 |