Re: Wine + GIT

From: <linux@horizon.com>
Date: 2005-12-08 18:30:00
> 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...)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Thu Dec 08 18:31:16 2005

This archive was generated by hypermail 2.1.8 : 2005-12-08 18:31:23 EST