Number five (rebase instead of merge) is what we started doing shortly before we started using Gerrit. If you've ever gotten sick of seeing all those "merging"

Number five (rebase instead of merge) is what we started doing shortly before we started using Gerrit. If you've ever gotten sick of seeing all those "merging" commit messages in git, it's worth trying.