diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 02:21:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-05 02:21:42 -0700 |
| commit | 4bea3b6926609b0cfb1319b1b2e9b2697629b13f (patch) | |
| tree | db790922bcc7e2059ea228cf564df00dfd1993b3 /git-pull-script | |
| parent | d0d0d0bd3c2c4591ffbc292d7e082e8ad8f2057f (diff) | |
| download | git-4bea3b6926609b0cfb1319b1b2e9b2697629b13f.tar.gz git-4bea3b6926609b0cfb1319b1b2e9b2697629b13f.tar.xz | |
git-pull-script: do the diffstat also for the fast-forward case
This way you always see what the state change was.
Diffstat (limited to 'git-pull-script')
| -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 e7e82f49d..44cb6d5a8 100755 --- a/git-pull-script +++ b/git-pull-script @@ -39,6 +39,7 @@ if [ "$common" == "$head" ]; then sleep 3 git-read-tree -m $merge_tree && git-checkout-cache -f -a && git-update-cache --refresh echo $merge_head > .git/HEAD + git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 exit 0 fi echo "Trying to merge $merge_head into $head" |