On Fri, Dec 2, 2011 at 02:37, Neal Kreitzinger <nkreitzinger@xxxxxxxxx> wrote: > It sounds like you're saying that people should rebase before merging to > main. That means their merge would be a fast-forward. You could just > reject anyone who has not done a current rebase. Then you could use this > technique from the pre-rebase.sample hook to enforce up-to-date rebases: That would be an overly invasive change to people's workflows. It's fine if you merge something in as long as the initial merge base isn't N days older than the current state of the mainline. -- 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