From: Jeff King <peff@peff.net>
Date: Fri, 10 Aug 2007 00:01:26 GMT
Subject: Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.
Message-ID: <20070810000126.GB10250@sigill.intra.peff.net>
In-Reply-To: <7v3aysxvk3.fsf@assigned-by-dhcp.cox.net>

On Thu, Aug 09, 2007 at 02:11:24PM -0700, Junio C Hamano wrote:

> Right now I do not have time to dig mailing list archive around
> mid March 2006, and I do not recall the requestor's original
> rationale, but I have a vague recollection that we added this
> "no fast-forward check" specifically in response to a user
> request.

Maybe it was the "I'm using a custom merge strategy that might refuse
the merge, but fast-forwards don't even invoke my merge strategy"
request?

-Peff