indent using tabs
GIT: prune remotes on fetch
GIT: sometimes git merge --abort doesn't work. so do a git reset --hard