diff options
author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-08-03 17:41:29 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-03 21:32:02 +0400 |
commit | 98e840663251fc99055265b9bd4710e398310eb7 (patch) | |
tree | 5a9fae0a42e6faa225582d28a756a25c63a52ff3 | |
parent | 3503b8d0da61d920ebd9294fd6a9a0f758328fd3 (diff) |
gitattributes: Clarify discussion of attribute macros
In particular, make it clear that attribute macros are themselves
recorded as attributes in addition to setting other attributes.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/gitattributes.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 412c55b549..ccb3f3f14e 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -879,16 +879,19 @@ produced for, any binary file you track. You would need to specify e.g. ------------ but that may become cumbersome, when you have many attributes. Using -attribute macros, you can specify groups of attributes set or unset at -the same time. The system knows a built-in attribute macro, `binary`: +attribute macros, you can define an attribute that, when set, also +sets or unsets a number of other attributes at the same time. The +system knows a built-in attribute macro, `binary`: ------------ *.jpg binary ------------ -which is equivalent to the above. Note that the attribute macros can only -be "Set" (see the above example that sets "binary" macro as if it were an -ordinary attribute --- setting it in turn unsets "text" and "diff"). +Setting the "binary" attribute also unsets the "text" and "diff" +attributes as above. Note that attribute macros can only be "Set", +though setting one might have the effect of setting or unsetting other +attributes or even returning other attributes to the "Unspecified" +state. DEFINING ATTRIBUTE MACROS |