From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 Jan 2007 06:14:28 GMT
Subject: Re: How to merge FETCH_HEAD?
Message-ID: <7vk5zmtc1n.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20070117050955.GC4329@mellanox.co.il>

"Michael S. Tsirkin" <mst@mellanox.co.il> writes:

>> No. FETCH_HEAD is local. And for local merges, you should use git-merge, 
>> not git-pull.
>
> But, that can not take FETCH_HEAD either.
> Would it be useful for git-merge FETCH_HEAD to work?

Please try again, starting from the "git fetch".

I suspect the reason you think "merge FETCH_HEAD" does not work
is because you lost FETCH_HEAD when you did "git pull . FETCH_HEAD",
as I explained to you in an earlier message.