From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 02 Dec 2011 11:27:06 GMT
Subject: Re: Anyone have a commit hook for forbidding old branches from being merged in?
Message-ID: <CACBZZX5+AC0ZxsdNMrEEq=h+1KWDxXhCxL2P7UBdM=cPTwS7vA@mail.gmail.com>
In-Reply-To: <4ED82BCA.5080909@gmail.com>

On Fri, Dec 2, 2011 at 02:37, Neal Kreitzinger <nkreitzinger@gmail.com> 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.