From patchwork Thu Mar 7 06:05:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10842227 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 55E77180E for ; Thu, 7 Mar 2019 06:05:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 406742E5B5 for ; Thu, 7 Mar 2019 06:05:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23AF82E877; Thu, 7 Mar 2019 06:05:07 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 F03EA2E5B5 for ; Thu, 7 Mar 2019 06:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726476AbfCGGFE (ORCPT ); Thu, 7 Mar 2019 01:05:04 -0500 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38301 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726028AbfCGGFE (ORCPT ); Thu, 7 Mar 2019 01:05:04 -0500 Received: by mail-pg1-f196.google.com with SMTP id m2so10399430pgl.5 for ; Wed, 06 Mar 2019 22:05:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=U8VlA82TK7atpj+Es0OYZ/Z5djYU6BDgIwW/6rdvEoc=; b=UwJ6PBDEPL3Q3aKdGo4tjwQoMFD7xf/2N4pD+NDRGvxUPzLmzjweDztWr+HsiAs2Ns JkXjpGGqnrLX8eRUNZ345i7BlcbFq2eg39fQTeM1PW+cnoSggG7cD8uM/wPRZ5YMa44i YJ6mnR7iEPvW//npBAXMNyF4mfb8s26NjZV/GuE3Wa8ksWKLUeYirV32rS8ansgz47nZ jjtgtyXErmPffiFUFPK8wkMDv2yigrutoyispEksHMA2Ui257yzbkpVXhsc0iNyiLKfb Kv5jeAupKPZdLnB8xppRZjIvctJeXmkKAmF3au9qMlru0Rf0fW7VdT1bSiGkaH3g6g/b MGMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=U8VlA82TK7atpj+Es0OYZ/Z5djYU6BDgIwW/6rdvEoc=; b=XLRMuTOzjXFdY5XZl/UQheRw5Zu/iug1hFjDJqgst23PZUctTjbpAr2BZytFyryhQq U7tUJYppecX66nfSlHRFuiGLnu3a+8R+yU4b3iYVX6mCl4BwmIhUpg2DAtcBHBOa+QM8 lFzPUrmlY3oa+8fawmPbExOUI4/TafzVDqBL6Y56YizxT6zO3cBwcacNbRa1hV5FH5qB 7wL88l5pakwPGQsbbPFDCtGmPD+LvWKheL+0p2QR22bbUmymXfuH6WpCOcNf9c1PwEIz qDiycKToXPxKy8xWVfXJVlaYY2ioRj8Syr+CsTURKrS2yAo5CN4nZ1sN3h7D4PvdsN+/ u+QA== X-Gm-Message-State: APjAAAVuNFZeQBF0iarFucEzUJTCrlFJw4adeLK9kS8zFS+q6CMdvEQT LpV6kFSH+6rPAgZiRB1nS8I2EeRN X-Google-Smtp-Source: APXvYqzNIMj64645jt2wu+xtBP3MbYsQ7btlATUvf/+1hnILgy2HQ4UhfgC07xf0H0TRGGlp5FsRUA== X-Received: by 2002:a62:29c6:: with SMTP id p189mr11438704pfp.194.1551938703227; Wed, 06 Mar 2019 22:05:03 -0800 (PST) Received: from archbookpro.localdomain (c-73-222-73-77.hsd1.ca.comcast.net. [73.222.73.77]) by smtp.gmail.com with ESMTPSA id e21sm9618269pfh.45.2019.03.06.22.05.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Mar 2019 22:05:02 -0800 (PST) Date: Wed, 6 Mar 2019 22:05:01 -0800 From: Denton Liu To: git@vger.kernel.org Cc: Martin =?iso-8859-1?q?=C5gren?= , Junio C Hamano Subject: [PATCH v2 1/1] git-clean.txt: clarify ignore pattern files Message-ID: <2eda83517ebad39e14dca9d86b9dc2e0d32e37ef.1551938421.git.liu.denton@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.3 (2019-02-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the git-clean documentation, -x and -e documented .gitignore, $GIT_DIR/info/excludes but neglected to mention the file pointed to by core.excludesFile. Remove specific list of files and, instead, reference gitignore(5) documentation so that information is consolidated and the git-clean documentation is more precise. Reported-by: Robert P. J. Day Helped-by: Martin Ågren Signed-off-by: Denton Liu --- Documentation/git-clean.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 03056dad0d..d251ef9dd2 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -55,13 +55,12 @@ OPTIONS -e :: --exclude=:: - In addition to those found in .gitignore (per directory) and - $GIT_DIR/info/exclude, also consider these patterns to be in the - set of the ignore rules in effect. + Use the exclude pattern in addition to those found in + `.gitignore` and similar files (see linkgit:gitignore[5]). -x:: - Don't use the standard ignore rules read from .gitignore (per - directory) and $GIT_DIR/info/exclude, but do still use the ignore + Don't use the standard ignore rules read from `.gitignore` and + similar files (see linkgit:gitignore[5]), but do still use the ignore rules given with `-e` options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git reset') to create a pristine From patchwork Thu Mar 7 08:25:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denton Liu X-Patchwork-Id: 10842371 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 54AA21869 for ; Thu, 7 Mar 2019 08:25:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43E1F2E63C for ; Thu, 7 Mar 2019 08:25:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 386632E658; Thu, 7 Mar 2019 08:25:37 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,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 CB9742E63C for ; Thu, 7 Mar 2019 08:25:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726250AbfCGIZf (ORCPT ); Thu, 7 Mar 2019 03:25:35 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44235 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726015AbfCGIZd (ORCPT ); Thu, 7 Mar 2019 03:25:33 -0500 Received: by mail-pf1-f196.google.com with SMTP id a3so10861964pff.11 for ; Thu, 07 Mar 2019 00:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=fmkuL2LNVi5f5+n2ISyjcBHbIX6McxLIHWePpT2KzS4=; b=oCi+1hcf3b+SLwPkD/SWqRC5d43WxTm9B3ymAOtZMJC7qdSJnbG/LH1ZlWvnI+jRei aeFIUDGurkchOE4H+8j0CSQKsYAzduClsEqYcO+qwIeVRoRQUa28uXHB0oB35St4SPDr TpXOLBh3+Bq592nSrhilhDbBDp7auB7l5mTMp+/eCk8zMmmlxetn68ClmMdBwhyirGxX KIj7RLjO2zvKyT2BxyAS9FkELLhCOyFziO7TjJigSt3iCfWFxFzcyDLj8zfvCyfU6fsz SkdTrpSn3rG9PE/gGUOL2tys7lBhmuYA7CLMdzZrN4d3D5SrHPzUVnFLJ/tQg5W0ESgn qsoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=fmkuL2LNVi5f5+n2ISyjcBHbIX6McxLIHWePpT2KzS4=; b=slA3rZMMQq7E1XjKPend2QCfIXzwvD59HT5KzkXeNOPNxt8rQZixKKEerYYJttqc2B sKyLpT0mVch0GtxGGIcG0Ion0BMpty4c8bWwK6d3wWczYOuK918B2d6OuamZAsYHkYcg zN8+kzw53T081rhderStkRmf32cjrXz6yHcYe8hjixOnyjaTAvjjUnlKwyPV35fTTSy2 pvyKrEYdiT9YhYVb7Y01F8HZRAof2weAOH6aVQxrO1fR/RGudcfR0bgzo4GYaTyIaOsv ZCGf109FdeTOlHWaLTZjxbnY8db/lhr7QVCtKMId1nEjcbhlw3e8w1iw94RWqDf63nuF i4ZA== X-Gm-Message-State: APjAAAVWPEDkU8GvoIir+zbZnrZ/ZmOqDjoRSGV2E/2b6j6g9xHU2Nx4 J3DB7ACGFqR/9SKBE6N28U+QFayK X-Google-Smtp-Source: APXvYqyumm8Fm9gIIeuEoV04L8WmTge1m4liCNWskauPTkNdH1COpgpMc2FtlvxV4XqmUxtV/dxKAg== X-Received: by 2002:a17:902:7082:: with SMTP id z2mr11310571plk.251.1551947132989; Thu, 07 Mar 2019 00:25:32 -0800 (PST) Received: from archbookpro.localdomain (c-73-222-73-77.hsd1.ca.comcast.net. [73.222.73.77]) by smtp.gmail.com with ESMTPSA id h65sm5326252pgc.93.2019.03.07.00.25.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Mar 2019 00:25:32 -0800 (PST) Date: Thu, 7 Mar 2019 00:25:30 -0800 From: Denton Liu To: Git Mailing List Cc: Martin =?iso-8859-1?q?=C5gren?= , Junio C Hamano Subject: [PATCH v3 2/2] Docs: move core.excludesFile from git-add to gitignore Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.3 (2019-02-01) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There was a section on configuration mentioning core.excludesFile in git-add.txt. However, the core.excludesFile config variable is not exclusive to git-add. Move this description to gitignore.txt to be more generic. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 9 --------- Documentation/gitignore.txt | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 37bcab94d5..8b0e4c7fa8 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -193,15 +193,6 @@ for "git add --no-all ...", i.e. ignored removed files. for command-line options). -CONFIGURATION -------------- - -The optional configuration variable `core.excludesFile` indicates a path to a -file containing patterns of file names to exclude from git-add, similar to -$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See linkgit:gitignore[5]. - - EXAMPLES -------- diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 1c94f08ff4..b5bc9dbff0 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -132,6 +132,14 @@ full pathname may have special meaning: - Other consecutive asterisks are considered regular asterisks and will match according to the previous rules. +CONFIGURATION +------------- + +The optional configuration variable `core.excludesFile` indicates a path to a +file containing patterns of file names to exclude, similar to +`$GIT_DIR/info/exclude`. Patterns in the exclude file are used in addition to +those in `$GIT_DIR/info/exclude`. + NOTES -----