{"thread":{"id":"13893","subject":"autocrlf and git manual","startedAt":"2008-06-11T11:53:44Z","lastAt":"2008-06-11T13:06:57Z","messageCount":2,"participants":["John Yesberg","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"79445","messageId":"1033a22d0806110453h16782758i7318ef4fce434ba@mail.gmail.com","threadId":"13893","inReplyTo":null,"subject":"autocrlf and git manual","fromName":"John Yesberg","fromEmail":"john.yesberg@gmail.com","sentAt":"2008-06-11T11:53:44Z","receivedAt":"2008-06-11T11:53:44Z","isPatch":false,"sender":{"key":"john.yesberg@gmail.com","avatar":null},"body":"Hi all. I'm just starting with git. Downloaded the msysgit 1.5.5 for\nwindows, and tried to work through the manual from\nhttp://www.kernel.org/pub/software/scm/git/docs/user-manual.html.\n\nThe first step was to clone an existing repository. I had trouble\nbecause I'm behind a proxy. Is it worth putting a short section in the\nmanual describing how the proxy should be set? In the Git Bash, I\ntried using\n$ git config --global http.proxy proxyname:port\nbut it didn't work. So I tried\n$ git config --global http.proxy http://proxyname:port\nthat didn't work. I tried\n$ export http_proxy=http://proxyname:port\nand this time it (the clone) did work.\n\nThen, I went on to the second subsection of the manual, How to check\nout a different version of the project. The command\n$ git checkout -b new v0.2\nfailed with:\nerror: Entry 'org.spearce.egit-feature/.settings/org.eclipse.core.runtime.prefs'\nnot uptodate. Cannot merge.\n\nAfter some searching, I found roughly what this message means.\nNoticing a suggestion elsewhere in the manual advice to try gitk, I\ndiscovered that there were \"Local uncommitted changes, not checked\ninto index\" as suggested by the error. But I hadn't made any changes.\nI remembered the release notes from the installation procedure warning\nme of an autocrlf issue that had changed recently. The diff aspect of\ngitk didn't really demonstrate whether this was the issue, but I tried\nremoving the repository, setting core.autocrlf false, and then cloning\nit again. This time, gitk didn't identify any local uncommitted\nchanges, and creating a new branch worked. Perhaps it would be good if\nthe manual could help windows newbies out by providing a hint here -\notherwise they're likely to be discouraged away from git.\n\nI didn't see any contact details in the manual or on the web site. I'd\nbe happy to contribute text if that helps: Is there a markup language?\nWho is the editor?\n\nThanks,\n\nJohn.\n"},{"id":"79448","messageId":"m3d4moruhg.fsf@localhost.localdomain","threadId":"13893","inReplyTo":"1033a22d0806110453h16782758i7318ef4fce434ba@mail.gmail.com","subject":"Re: autocrlf and git manual","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-06-11T13:06:57Z","receivedAt":"2008-06-11T13:06:57Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"\"John Yesberg\" <john.yesberg@gmail.com> writes:\n\n> I didn't see any contact details in the manual or on the web site. I'd\n> be happy to contribute text if that helps: Is there a markup language?\n\nYes, all (almost all) documentation in git use AsciiDoc markup language.\n\n> Who is the editor?\n\n\"Git User's Manual\" is mainly creation of J. Bruce Fields (from what I\nrememeber, and also from the number of commits).  So if you want to\nadd to that, it would be I think best simply to send patch (if\npossible), Cc-ing him.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"}]}