From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 854DE1F45A for ; Thu, 15 Aug 2019 04:56:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729668AbfHOE4N (ORCPT ); Thu, 15 Aug 2019 00:56:13 -0400 Received: from rdnemail.bankofamerica.com ([171.161.147.155]:33130 "EHLO bankofamerica.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726098AbfHOE4N (ORCPT ); Thu, 15 Aug 2019 00:56:13 -0400 Received: from txdmzmailmx07.bankofamerica.com ([171.180.168.234]) by lrdna0myxepmx02.bankofamerica.com (8.15.2/8.15.2) with ESMTP id x7F4uB1K001683; Thu, 15 Aug 2019 04:56:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bofa.com; s=corp1903; t=1565844971; bh=27vIvUzWnBXTSUKxSSdtNdc29H5tE2WAQHP/c39IMMU=; h=Date:From:Subject:In-reply-to:To:Cc:Message-id:MIME-version: Content-type:Content-transfer-encoding:References; b=bTpNJkgsOAR6qDhKU5EviDiQC3+3re2dXinskb0TRego5JuRfTH7/jtGJV1IkPNVr l6oCSnaahG2xMaiisAK6uhUuJVyDcigxEiAnFypf1EfqsCaKZx7NByr3WeDTIUV7bF zaBB+QTHcvAM1aMEfQl7pnOufQViwh+yG7+LS0Zs= Received: from lrdna0n4xepmx12.bankofamerica.com (lrdna0n4xepmx12.bankofamerica.com [171.206.154.16]) by txdmzmailmx07.bankofamerica.com (8.15.2/8.15.2) with ESMTP id x7F4uAoo003586; Thu, 15 Aug 2019 04:56:10 GMT Date: Thu, 15 Aug 2019 04:56:05 +0000 From: "Yagnatinsky, Mark" Subject: RE: suggestion for improved docs on autocrlf In-reply-to: <0244daea3faa4d4aa899cff0dcc62917@bofa.com> X-Originating-IP: [30.245.13.45] To: =?iso-8859-1?Q?=27Torsten_B=F6gershausen=27?= Cc: "'Junio C Hamano'" , "'git@vger.kernel.org'" Message-id: MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-language: en-US Content-transfer-encoding: 7BIT X-MS-Has-Attach: Accept-Language: en-US Thread-topic: suggestion for improved docs on autocrlf Thread-index: AdVNISlxEEknYFEsRQ6Yj1wK7ruvjABLB7eAAAekNtAADVdLsP//xzkA//9/qwCABDUnAP/+mJWQgANNx4CAADsrQP//18WAABMUKAD//38MoP/+sX+A//2l2mD/+aztkP/ypH+g X-MS-TNEF-Correlator: References: <577a66e0c26545aaa4795de3c5189c9d@bofa.com> <20190809033406.5t5ag3qmh36ideec@tb-raspi4> <0c1b48c9fad641689ead69fdd9f72d63@bofa.com> <20190811121004.guygurnopwwggvsp@tb-raspi4> <64c0a35825af4ff3956c6c9a5fb748bb@bofa.com> <20190812171049.ydec3nsmkt2xplhd@tb-raspi4> <20190813032452.qg2ufgljm4bjeznr@tb-raspi4> <20190813154033.uhi7w5jgwcj4xan7@tb-raspi4> <0244daea3faa4d4aa899cff0dcc62917@bofa.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-08-15_02:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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: 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.