Trolling on #yakking about git workflows:
@liw master or gtfo. That's our mantra at WMF as well.
@Greg Directly in master or short-lived branch merged to master daily?
@liw @Greg well, we use Gerrit, so each patchset is effectively a branch, but those are merged into master upon merging. If there are longer than a day 'branches' it's because their change hasn't merged yet, but rebasing is easy.
@liw rebasing is easy unless it isn't, that is ;)