diff options
| -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" |