> Quoting Junio C Hamano <junkio@xxxxxxx>: > Subject: Re: How to merge FETCH_HEAD? > > "Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx> 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. Yes, that was it, thanks! -- MST - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html