From: Junio C Hamano Date: Fri, 29 Apr 2011 16:27:47 GMT Subject: Re: [PATCH 0/2] merge-one-file and GIT_WORK_TREE Message-ID: <7v4o5hyqd8.fsf@alter.siamese.dyndns.org> In-Reply-To: <20110428223822.GA16004@sigill.intra.peff.net> Jeff King writes: > The problem is that merge-one-file simply assumes it is in the root of > the working tree without any checking. It is kind of surprising that there was only one place that you needed to touch ;-). Thanks.