зеркало из https://github.com/microsoft/git.git
git-pull-script: do the diffstat also for the fast-forward case
This way you always see what the state change was.
This commit is contained in:
Родитель
d0d0d0bd3c
Коммит
4bea3b6926
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче