Dan Aloni

How about using gsr? See: https://github.com/da-x/git-search-replace

I never use 'git pull'. The reason is that I want to fetch - look at what other people changed, and only then decide whether I'd like to rebase to those changes now, while I'm doing my stuff locally.

So my advice - unless you know exactly what you are getting from the remote branch, don't use 'git pull'.