From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 09 Jun 2009 20:54:05 GMT
Subject: Re: Git merge selective files
Message-ID: <7v63f5ku1e.fsf@alter.siamese.dyndns.org>
In-Reply-To: <32541b130906091239x1c92a1caxd260983a66e8025f@mail.gmail.com>

Avery Pennarun <apenwarr@gmail.com> writes:

> And the "'merge --squash' and don't commit the changes you don't want"
> option looks okay to me too.

Whatever you do to prepare the tree contents to suit the desire of the
original request, I think it is essential not to record the result of such
an operation as a merge (because it is not, and it will screw up later
merges).

Use of "merge --squash" in this thread is a very good suggestion.

Good job.