gitpu -> git pull --rebase; diff -> colordiff