From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Fri, 28 Aug 2009 08:46:06 GMT
Subject: Re: Using git to track my PhD thesis, couple of questions
Message-ID: <vpq7hwo8gxd.fsf@bauges.imag.fr>
In-Reply-To: <4A979690.1050601@gnu.org>

Paolo Bonzini <bonzini@gnu.org> writes:

> You can also merge from the master to your working branch after every
> merge --squash.

Yes, good point. I didn't think of this, but it works because ...

>    ... work on local ...
>    git commit
>    ... work on local ...
>    git commit
>
>    git checkout master
>    git merge --squash local; git commit -m'day 1'

... this should fast-forward, so get the same tree as in branch
'local' and ...

>    git checkout local
>    git merge master

... then this is a merge of two identical trees, so it's trivial.

-- 
Matthieu