From: linux@horizon.com
Date: Thu, 08 Dec 2005 07:30:00 GMT
Subject: Re: Wine + GIT
Message-ID: <20051208073000.7097.qmail@science.horizon.com>

> The paragraph "Once you have finished editting [sic]..." needs
> to be followed by:
> 
>	git-update-index those paths you hand corrected
>        git-commit

This is what happens when you have people too used to using the
pre-porcelain plumbing.

How about just
git-commit <the paths you hand corrected>

If you forget any, the commit will fail, but they will have been
updated in the index, and you don't need to mention them again in the
next attempt.


(Grump... I just noticed that the "recursive" merge stratgy *doesn't*
generate a merged file containing conflict markers, at least not in
the case I tried.  Instead I get "a~HEAD" and "a~branch" files.
Time to fix the docs...)