mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Andrew Berry" <>
To: "Junio C Hamano" <>
Subject: Re: [PATCH] docs: .gitignore parsing is to the top of the repo
Date: Sun, 18 Jul 2021 10:12:28 -0400	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <xmqqk0m3gl6a.fsf@gitster.g>

On 6 Jul 2021, at 17:57, Junio C Hamano wrote:

> If you do "toplevel" -> "top-level" while at it, perhaps we would
> want to correct "work tree" -> "working tree".

Rather than think of this as a one-off fix, I thought to look to see how 
many instances of each are currently used.

toplevel: 246
top-level: 119
work tree: 538
working tree: 2610

Since many of these instances are in translated strings, and that the 
text is understandable with any of the variants, I don't think it's 
worth changing. "Our standard is no standard" etc.

That leaves bringing the note about the work tree earlier in the 
sentence. Here's a hopefully easier to read word-diff. Look good?

diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 53e7d5c914..b4c8b9c0de 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -27,12 +27,11 @@ precedence, the last matching pattern decides the 

  * Patterns read from a `.gitignore` file in the same directory
    as the path, or in any parent [-directory, with patterns in the-]
[-   higher level files-]{+directory+} (up to the toplevel of the work
    [-tree)-]{+tree), with patterns in the higher level files+} being 
overridden by those in
    lower level files down to the directory containing the file. These 
    match relative to the location of the `.gitignore` file.  A project 
    includes such `.gitignore` files in its repository, containing 
patterns for
    files generated as part of the project build.

  * Patterns read from `$GIT_DIR/info/exclude`.

  parent reply	other threads:[~2021-07-18 14:12 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-02 22:20 [PATCH] docs: .gitignore in parents is current repo only Andrew Berry
2021-07-03  0:06 ` Junio C Hamano
2021-07-03  0:21 ` Bagas Sanjaya
2021-07-05 17:30   ` Andrew Berry
2021-07-05 19:59     ` Junio C Hamano
2021-07-05 23:50       ` Andrew Berry
2021-07-06 16:18         ` Junio C Hamano
2021-07-06 20:54           ` [PATCH] docs: .gitignore parsing is to the top of the repo Andrew Berry
2021-07-06 20:57             ` Andrew Berry
2021-07-06 21:57               ` Junio C Hamano
2021-07-07  0:18                 ` Junio C Hamano
2021-07-07  0:32                   ` Andrew Berry
2021-07-07  1:20                     ` Junio C Hamano
2021-07-18 14:12                 ` Andrew Berry [this message]
2021-07-19 18:36                   ` Junio C Hamano
2021-07-06 21:55             ` Junio C Hamano

Reply instructions:

You may reply publicly 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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).