From: david@lang.hm
Date: Fri, 28 Aug 2009 21:42:24 GMT
Subject: Re: Using git to track my PhD thesis, couple of questions
Message-ID: <alpine.DEB.2.00.0908281442050.28411@asgard.lang.hm>
In-Reply-To: <vpqpragt5bo.fsf@bauges.imag.fr>

On Fri, 28 Aug 2009, Matthieu Moy wrote:

> seanh <seanh.nospam@gmail.com> writes:
>
>> In response to Matthieu and Paolo, I'm not sure I understand the git
>> internals involved in the discussion around merge --squash, I had a
>> feeling this would produce a 'merge' that git in some sense would 'not
>> know about',
>
> Yes, that's it. Git does a merge, and immediately forgets it was a
> merge. The consequence is when you merge again later, Git will not be
> able to use the merge information to be clever about merging. Somehow,
> Git will be as bad as SVN for merging if you don't know what you're
> doing ;-).

I thought that was what rere did?

David Lang