diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:14 -0700 |
| commit | 747f9d30ed706ebd930ef888971fff5638334831 (patch) | |
| tree | 935ab8af02497137b524cc64059ae3f555249ae7 /Documentation/gitignore.txt | |
| parent | Change double quotes to single quotes in message (diff) | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| download | tgif-747f9d30ed706ebd930ef888971fff5638334831.tar.xz | |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
Documentation: clarify .gitattributes search
git-checkout.txt: clarify that <branch> applies when no path is given.
git-checkout.txt: fix incorrect statement about HEAD and index
Diffstat (limited to 'Documentation/gitignore.txt')
| -rw-r--r-- | Documentation/gitignore.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 59321a2e82..7df3cef46f 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -31,8 +31,8 @@ precedence, the last matching pattern decides the outcome): * 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 root) being overridden by those in - lower level files down to the directory containing the file. + 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 |