Re: Using git to track my PhD thesis, couple of questions

Paolo Bonzini [off-list ref] 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