From: Junio C Hamano Date: Sat, 30 Aug 2008 21:34:55 GMT Subject: Re: [PATCH] diff: treat -crlf files as binary Message-ID: <7vljyefaps.fsf@gitster.siamese.dyndns.org> In-Reply-To: <32541b130808291456k3de953a2yd1e93bc27ad14293@mail.gmail.com> "Avery Pennarun" writes: > I think the bug is that "crlf=false" should not be considered the same > as "binary=true", which seems to be a bug in the documentation, not > the program. Yeah, that's right. How about doing something like this? Documentation/gitattributes.txt | 39 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 36 insertions(+), 3 deletions(-) diff --git i/Documentation/gitattributes.txt w/Documentation/gitattributes.txt index db16b0c..ec8a860 100644 --- i/Documentation/gitattributes.txt +++ w/Documentation/gitattributes.txt @@ -105,9 +105,8 @@ Set:: Unset:: - Unsetting the `crlf` attribute on a path is meant to - mark the path as a "binary" file. The path never goes - through line endings conversion upon checkin/checkout. + Unsetting the `crlf` attribute on a path is tells git + not to attempt any end-of-line conversion upon checkin/checkout. Unspecified:: @@ -482,6 +481,40 @@ in the file. E.g. the string `$Format:%H$` will be replaced by the commit hash. +USING ATTRIBUTE MACROS +---------------------- + +You do not want any end-of-line conversions applied to, nor textual diffs +produced for any binary file you track. You would need to specify e.g. + +------------ +*.jpg -crlf -diff +------------ + +but that is cumbersome. 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`: + +------------ +*.jpg binary +------------ + +which is equivalent to the above. Note that the attribute macros can only +be "Set" (see the above example). + + +DEFINING ATTRIBUTE MACROS +------------------------- + +Custom attribute macros can be defined only in the `.gitattributes` file +at the toplevel (i.e. not in any subdirectory). The built-in attribute +macro "binary" is equivalent to: + +------------ +[attr]binary -diff -crlf +------------ + + EXAMPLE -------