use --ignore
Merge branch 'master' of github.com:gs/dotvim