3 ms·TL;DR: Use `git pull -r` This is it. This is whole article.by Svoka 8y agoTL;DR: Use `git pull -r` This is it. This is whole article.megakemp 8y agoThere is more to it than that. Did you know about `git pull --rebase=merges` as well?