From: Michael Haggerty Date: Wed, 3 Aug 2011 13:41:29 +0000 (+0200) Subject: gitattributes: Clarify discussion of attribute macros X-Git-Tag: v1.7.6.1~40 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=98e840663251fc99055265b9bd4710e398310eb7;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 412c55b54..ccb3f3f14 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