diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-03-27 13:35:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-27 13:35:18 -0700 |
| commit | 319a36a5c2da8dd07993caac43b7820bff3b0d37 (patch) | |
| tree | dcf79cf682e76fca476ff7bea7024efda338807e /Documentation/gitattributes.txt | |
| parent | test_must_fail: 129 is a valid error code from usage() (diff) | |
| parent | Update draft release notes for 1.5.4.5 (diff) | |
| download | tgif-319a36a5c2da8dd07993caac43b7820bff3b0d37.tar.xz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.4.5
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
t/t3800-mktag.sh: use test_must_fail rather than '!'
Conflicts:
t/t3800-mktag.sh
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 84ec9623a2..04ca63ca3d 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -63,6 +63,13 @@ path in question, and its parent directories (the further the directory that contains `.gitattributes` is from the path in question, the lower its precedence). +If you wish to affect only a single repository (i.e., to assign +attributes to files that are particular to one user's workflow), then +attributes should be placed in the `$GIT_DIR/info/attributes` file. +Attributes which should be version-controlled and distributed to other +repositories (i.e., attributes of interest to all users) should go into +`.gitattributes` files. + Sometimes you would need to override an setting of an attribute for a path to `unspecified` state. This can be done by listing the name of the attribute prefixed with an exclamation point `!`. |