Junio C Hamano <gitster@xxxxxxxxx> writes: > Andrew Berry <andrew@xxxxxxxxxxxx> writes: > >> * 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 (up to the toplevel of the work tree) being overridden >> - by those in lower level files down to the directory containing the file. >> - These patterns match relative to the location of the >> - `.gitignore` file. A project normally includes such >> - `.gitignore` files in its repository, containing patterns for >> + as the path, or in any parent directory (up to the top-level of the work >> + tree), with patterns in the higher level files being overridden by those in >> + lower level files down to the directory containing the file. These patterns >> + match relative to the location of the `.gitignore` file. A project normally >> + includes such `.gitignore` files in its repository, containing patterns for >> files generated as part of the project build. > > Line rewrapping makes it hard to see what actually got changed, but > does this only move "(up to the top-level of the work tree)" around > without anything else, as discussed? > > If you do "toplevel" -> "top-level" while at it, perhaps we would > want to correct "work tree" -> "working tree". > > Looking better. Another tangent. The discovery process used for the .gitattributes files is identical to what is done to the .gitignore files; we may want to make sure that the explanation we give in our documentation won't cause the same confusion you are trying to avoid with this change. Such a fix does not have to be (and probably should not be) a part of this change, though. Thanks.
