Skip to content

Commit

Permalink
git-pull-script: do the diffstat also for the fast-forward case
Browse files Browse the repository at this point in the history
This way you always see what the state change was.
  • Loading branch information
Linus Torvalds committed May 5, 2005
1 parent d0d0d0b commit 4bea3b6
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 @@ -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"
Expand Down

0 comments on commit 4bea3b6

Please sign in to comment.