don't git-stash when merging etc.