From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Aug 2007 08:45:47 GMT
Subject: Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.
Message-ID: <7vejibu69w.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7v3aysxvk3.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <gitster@pobox.com> writes:

> 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.

I do not think of a valid reason not to apply your patch.  We
wanted to avoid the trivial-merge codepath, but that is not a
valid reason to record a fast forward situation as a merge of
any kind.