Wow, I really just don't understand git. Is it generally a bad idea to try to rebase my branch after pulling master to get your lint changes? The rebase had conflicts as your lint change modified some things which were changed/deleted. I fixed those conflicts, added them and did git rebase --continue.

Now if I try to push, I get:

To https://github.com/spencerkimball/cockroach.git
 ! [rejected]        spencerkimball/diff-filter -> spencerkimball/diff-filter (non-fast-forward)
error: failed to push some refs to 'https://github.com/spencerkimball/cockroach.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

It's not obvious from the git man page what (e.g. 'git pull ...') is supposed to actually mean in practice.