From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 May 2009 06:42:48 GMT
Subject: Re: [Q] merge squash unexpected conflicts
Message-ID: <7v4ovoxk0n.fsf@alter.siamese.dyndns.org>
In-Reply-To: <bb9d69200905132334m7a4e3a4akde3529abeab5a09@mail.gmail.com>

Cory Sharp <cory.sharp@gmail.com> writes:

>> If you want support for repeated merges by merge tracking, you do not want
>> todiscard the merge history by using --squash.
>
> Why doesn't --squash do merge tracking?  The help didn't indicate that
> it doesn't, and I don't understand why ...

Because "merge" is (no surprise) what tracks what (two or more) things
were merged.  And with --squash you are choosing not to make a merge.  I
am not sure if there is any more thing to be explained...