On Mar 1, 1:15 pm, Steffen Prohaska <[EMAIL PROTECTED]> wrote: > Hi, > I uploaded the installer Git-preview20080301.exe, which includes a > recent master of official Git, includes git svn, and has > core.autocrlf=true as its default. It also includes recent bug > fixes from our devel branch. See the release notes for further > details.
Could I suggest that the release notes also mention the line of code that is used for setting the CRLF to false and you kindly provided in the other thread, namely: git config --global core.autocrlf false In order to test this version, I copied twice the directory where I have my main repository to test both settings of autocrlf. I have two branches there: the master one and the "development" one (actually, I have a third one but it is dead and I haven' used it for months). Before installing the new version of git, the current branch was the development one. Working on the first copy: I used the default (or set autocrlf to "true"). Firstly, git-gui detects all my files as "changed". I have to select them all and commit this as a big "CR/LF change" commit. Afterwards I can checkout the master branch (or another commit), but I cannot come back to the development branch. git-gui complains and refuse to move back. The error window says "File level merge required" then "Entry 'foo.bar' not uptodate. Cannot merge." then "Staying on branch master" where foo.bar is the name of one of the files in the directory. If I set the autocrlf to false and work of the second copy of my repository, everything works fine. No change is seen in the files, and I can checkout the master branch and come back to development one. Even better, with the setting on "false", I can also work fine on the first copy again and check out the development branch there. Best regards. Olivier > You can download the installer from > > http://code.google.com/p/msysgit/downloads > > I advanced the branches in msysgit.git and 4msysgit.git accordingly. > > Steffen
