If you have a good code review system, like Gerrit or Rietveld, you can do what I do. Every single commit and upload is immediately followed by `git checkout -

If you have a good code review system, like Gerrit or Rietveld, you can do what I do. Every single commit and upload is immediately followed by `git checkout -B master origin/master`. Use WIP tags for things you intend to keep working on and download the patch and upload new patch sets as you continue. Using the code review tool as a substitute for branches and continuously doing work off of a clean master has changed my life.