I use git pull --rebase --autostash
all the time at work (in git bash, if that matters).
But for some reason, some of my colleagues can't get it to work, and now I discovered it doesn't work at home.
At home I'm using git 2.6.3 on a macbook.
The error message is simply : error: unknown option `autostash'
Any ideas ?