change git pull + push, now with rebase