Merge pull request #387 from boxen/pull_less

don't auto-update on some local-only operations