From: Torsten Bögershausen <firstname.lastname@example.org> To: "Yagnatinsky, Mark" <email@example.com> Cc: 'Junio C Hamano' <firstname.lastname@example.org>, "'email@example.com'" <firstname.lastname@example.org> Subject: Re: suggestion for improved docs on autocrlf Date: Fri, 16 Aug 2019 06:20:25 +0200 Message-ID: <20190816042025.oiike3cahyfd5h7z@tb-raspi4> (raw) In-Reply-To: <email@example.com> On Thu, Aug 15, 2019 at 04:56:05AM +0000, Yagnatinsky, Mark wrote: > Okay, first attempt at better phrasing. This may need more paragraph breaks, or something. > Right now it's very wall-of-texty. And probably in a style way too different from the rest of the git docs. > Also, the syntax is probably closer to markdown than AsciiDoc; sorry. > Anyway, enough disclaimers, here's the first draft: Thanks so much for the suggestion. Feedback and Input like this from Git users are really appreciated. I will re-read it a couple of times, and probably find some time to make a patch out of it within the next days (or weeks). > > This variable has three valid settings: true, input, and false. > (Leaving it unset is equivalent to setting it to "false".) > 1. Set it to "true" if you want to have CRLF line endings in your > working directory and the repository has LF line endings. > Setting it to true is the same as setting the `text` attribute to > "auto" on all files and core.eol to "crlf". In other words: any file > that has LF line endings in the repository will have CRLF line > endings in your working directory. If you commit a new file to > the repository, then git will commit it with LF line endings, even > if it has CRLF endings in your working directory. However, if you > edit an existing file that has CRLF line endings in the repository, > then git will not convert it to LF line endings when you commit it. > > 2. If you set it to "input" then git will not do any line ending conversions > when checking files out of the repository into your working directory. > That is, immediately after a checkout, the line endings in your working > directory will match those in the repository. When committing a new > file to the repository, git will commit it with LF line endings, even if it has > CRLF line endings in your working directory. If you edit an existing file in > the repository, then: > * If the file had LF line endings in the repository, it will still have them, > no matter what line endings are in the working directory. > * If the file has LF line endings in the working directory, then it will be > committed with LF line endings , no matter what line endings it used > to have in the repository. > If neither of the above two cases apply, (in other words, if the file has CRLF > endings in the repository and in also in the working directory), then it will be > committed with CRLF line endings. > > 3. The simplest setting to explain is "false". In this setting, git will not > perform any line ending conversion; all files will be checked out into > the working directory exactly as they are in the repo, and will be > committed to the repo exactly as they are in the working directory. > This setting is recommended; if you are tempted to use "input" or "true" > instead of "false", then consider looking into committing a .gitattributes file > into your repository instead. Settings in that file override this configuration > variable, and since the same attributes file is being used by everyone who > works on the repo, the results end up being more predictable. > > Or something like that. > > ---------------------------------------------------------------------- > This message, and any attachments, is for the intended recipient(s) only, may contain information that is privileged, confidential and/or proprietary and subject to important terms and conditions available at http://www.bankofamerica.com/emaildisclaimer. If you are not the intended recipient, please delete this message.
next prev parent reply index Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-07 13:08 Yagnatinsky, Mark 2019-08-08 20:56 ` Torsten Bögershausen 2019-08-08 21:19 ` Yagnatinsky, Mark 2019-08-08 23:08 ` Yagnatinsky, Mark 2019-08-09 3:34 ` Torsten Bögershausen 2019-08-09 15:34 ` Yagnatinsky, Mark 2019-08-11 12:10 ` Torsten Bögershausen 2019-08-12 13:47 ` Yagnatinsky, Mark 2019-08-12 15:46 ` Junio C Hamano 2019-08-12 15:52 ` Yagnatinsky, Mark 2019-08-12 17:10 ` Torsten Bögershausen 2019-08-12 18:00 ` Yagnatinsky, Mark 2019-08-12 18:18 ` Junio C Hamano 2019-08-12 18:30 ` Yagnatinsky, Mark 2019-08-13 3:24 ` Torsten Bögershausen 2019-08-13 15:31 ` Yagnatinsky, Mark 2019-08-13 15:40 ` Torsten Bögershausen 2019-08-13 15:44 ` Yagnatinsky, Mark 2019-08-14 16:28 ` Yagnatinsky, Mark 2019-08-15 4:56 ` Yagnatinsky, Mark 2019-08-16 4:20 ` Torsten Bögershausen [this message] 2019-08-16 19:12 ` Yagnatinsky, Mark 2019-08-13 16:40 ` Junio C Hamano
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190816042025.oiike3cahyfd5h7z@tb-raspi4 \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
firstname.lastname@example.org list mirror (unofficial, one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Example config snippet for mirrors Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ AGPL code for this site: git clone https://public-inbox.org/public-inbox.git