On Fri, Aug 1, 2014 at 5:13 PM, Mike Stump <mikestump@xxxxxxxxxxx> wrote: > On Aug 1, 2014, at 12:22 PM, Nico Williams <nico@xxxxxxxxxxxxxxxx> wrote: >> If you always rebase > > I can’t use rebase unless you make rebase work with multiple users and pushing pulling. That works now, and I do it all the time. Have a single repo ("the truth"), always rebase local commits on top of the latest upstream, always do fast-forward pushes. Done. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html