I've been rebasing at Square. Definitely check out gerrithub.io as soon as possible. I'm going blind looking at these unified diffs.