From patchwork Tue Jan 29 12:40:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jeff King X-Patchwork-Id: 10786147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C04CD184E for ; Tue, 29 Jan 2019 12:40:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0A2A2B476 for ; Tue, 29 Jan 2019 12:40:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AED4F2C061; Tue, 29 Jan 2019 12:40:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1933C2B476 for ; Tue, 29 Jan 2019 12:40:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727939AbfA2Mkd (ORCPT ); Tue, 29 Jan 2019 07:40:33 -0500 Received: from cloud.peff.net ([104.130.231.41]:52884 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1727033AbfA2Mkd (ORCPT ); Tue, 29 Jan 2019 07:40:33 -0500 Received: (qmail 25126 invoked by uid 109); 29 Jan 2019 12:40:33 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Tue, 29 Jan 2019 12:40:33 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 6016 invoked by uid 111); 29 Jan 2019 12:40:39 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with (ECDHE-RSA-AES256-GCM-SHA384 encrypted) SMTP; Tue, 29 Jan 2019 07:40:39 -0500 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Tue, 29 Jan 2019 07:40:31 -0500 Date: Tue, 29 Jan 2019 07:40:31 -0500 From: Jeff King To: Torsten =?utf-8?q?B=C3=B6gershausen?= Cc: Junio C Hamano , Sergey Lukashev , "git@vger.kernel.org" Subject: [PATCH v2 0/2] eol/autocrlf doc clarifications Message-ID: <20190129124031.GA13084@sigill.intra.peff.net> References: <57362151548583138@iva8-37fc2ad204cd.qloud-c.yandex.net> <13169311548590123@iva1-16f33c6a446b.qloud-c.yandex.net> <20190128160944.GB23588@sigill.intra.peff.net> <1593541548699120@myt6-27270b78ac4f.qloud-c.yandex.net> <20190128183117.GA13165@sigill.intra.peff.net> <20190129073810.23op5qaibyj2amwq@tb-raspi4> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190129073810.23op5qaibyj2amwq@tb-raspi4> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, Jan 29, 2019 at 07:38:10AM +0000, Torsten Bögershausen wrote: > > Yeah, I think the word "property" is unnecessarily confusing. Here's > > another patch (meant to go on top of the other). > > The property was originally meant to say: > - Either the "text" attribute is set in .gitattributes > or > - The "text=auto" attribute is set in .gitattributes and > Git auto-detects the file as text (and not as binary). Thanks, that makes it much more clear what the original was trying to say. > > + conversion. Note that this value is ignored if `core.autocrlf` > > + is set to `true`. > > Should that be > > + conversion. Note that this value is ignored if `core.autocrlf` > > + is set to `true` or `input`. Yes (and ditto in the other patch). Here's a re-roll of both patches addressing these issues. [1/2]: doc/gitattributes: clarify "autocrlf overrides eol" [2/2]: docs/config: clarify "text property" in core.eol Documentation/config/core.txt | 7 +++++-- Documentation/gitattributes.txt | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) -Peff