2011/10/15 Mark Thomas <ma...@apache.org>: > On 15/10/2011 11:02, Konstantin Kolinko wrote: >> How do you run git? Do you use Cygwin, or maybe TortoiseGit? > > http://code.google.com/p/msysgit/downloads/list > >> I think http://wiki.apache.org/general/GitAtApache might need to be updated >> to reflect the issue, but I am not yet sure what the correct setting is. > > For Tomcat, it appears core.autocrlf=false is the way to go but I'd like > to keep an eye on things for a while. > >> Your last commits were OK. > > Now I've figured out how to spot when things go wrong, I shouldn't mess > things up again. > >> I hope infra people will install a pre-commit hook to prevent such >> commits from happening. One hook was already proposed in the thread >> above. > > As git is used more with svn, that is probably a good idea. > > As an aside, I am finding it really useful. The things I have found I > have been able to do much more easily include: > - work on multiple bugs at once and switch between them > - do code clean-up and re-factoring as I go along but then cherry pick > selected changes (e.g. the cleanup) and commit them separately so the > commit for the actual fix is cleaner > - go back a few steps when I realise I need to change track with a fix > > There is a learning curve and if I hadn't been forced (against my will > at the time) to use git at $work I doubt I would find the things I am > doing now quite as easy. >
One more thing to note: 1. Apparently Git does not set svn:eol-style for you 2. I think that before setting svn:eol-style=native you have to explicitly convert the file to LF line ends if you are on Windows. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
