From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 23 Nov 2009 07:51:07 GMT
Subject: Re: [PATCH 2/2] user-manual: Document that "git merge" doesn't like uncommited changes.
Message-ID: <vpqd439he6s.fsf@bauges.imag.fr>
In-Reply-To: <7vy6lyaz9b.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> 	The work tree is overwritten by the result of the
>         merge when this combining is done cleanly, and the result is
>         committed. Otherwise it is
> 	overwritten by a half-merged results when this combining results

I thought of something like this, but this is slightly incorrect in
case of fast-forward (Git doesn't "commit", but "reuses" a commit), so
I prefered making a separate paragraph.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/