From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 09 Aug 2007 21:11:24 GMT
Subject: Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.
Message-ID: <7v3aysxvk3.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070809120831.19319.qmail@a61af064a2a242.315fe32.mid.smarden.org>

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.