Re: MinGW port - initial work uploaded

From: Junio C Hamano <junkio@cox.net>
Date: Jan 24, 2007, 05:05 UTC
Message-ID: <7vk5zdhv5r.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0701240251230.22628@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 5 quoted lines

> Seriously again, the users of merge-index are
>
> git-merge, which I do not really understand
>
> What I am nervous about is git-merge.

I think you are referring to the "carry forward local change" logic in 'next'.

First of all, BAD DSCHO. You should be looking at 'master', not 'next' during -rc period ;-).

Seriously again, the codepath is taken when the merge is a fast forward to another commit (iow, our HEAD is an ancestor of the other branch, so we will end up updating the branch tip with the tip of the other branch). The use of merge-index there can be replaced when we use merge-recursive instead of the 3-way "read-tree -m" the same way as how "checkout -m" implements the branch switching with local changes.