On Domingo, 31 de Mayo de 2009 14:45:31 Ed W escribió: > Hi > > Can everyone using git please enable (the default in recent git builds) > the option "autocrlf=true" (or =input if you prefer) > > Unfortunately a bunch of recent commits have gone in with mixed line > endings and with the best will in the world git just works better if you > commit everything with unix line endings and enable the auto conversion > option on checkout. In particular mixed line endings seem to stuff up > several diff tools and my editor (Netbeans) gets confused and starts > swapping the line endings on complete files, etc > > Whilst it's just a nuisance for .rb files, it seems to break some subtle > features if you have windows line endings in .erb files or mixed endings > in javascript files > > In case the purpose of this option isn't clear - "input" forces files to > be converted to unix endings on checkin and does nothing on checkout. > "true" will force files to be converted on checkin, but then converts > back to your platform line endings on checkout. In particular it > ensures that you don't have mixed line endings and it allows the diff > tools to work with a consistent line ending > > To fixup a given repo, simply set your option (preferably globally), > then "git reset HEAD --hard" will reset the repo to the current head and > git status will show a bunch of modified files with line endings that > differ from the repo > > I have previously submitted patches to fixup line endings, but the repo > is starting to migrate to mixed endings again (ie mixed endings in a > single file) > > Thanks > > Ed W
Thanks, I have fixed the line endings -- Sergio Cambra .:: entreCables S.L. ::. Nicolás Guillén 6, locales 2 y 3. 50.018 Zaragoza T) 902 021 404 F) 976 52 98 07 E) [email protected] --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "ActiveScaffold : Ruby on Rails plugin" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/activescaffold?hl=en -~----------~----~----~----~------~----~------~--~---
