Browse Source

git-pull-script: do the diffstat also for the fast-forward case

This way you always see what the state change was.
maint
Linus Torvalds 20 years ago
parent
commit
4bea3b6926
  1. 1
      git-pull-script

1
git-pull-script

@ -39,6 +39,7 @@ if [ "$common" == "$head" ]; then @@ -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"

Loading…
Cancel
Save