summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Collapse)AuthorAgeFilesLines
* Grammar fixes for gitattributes documentationWincent Colaiuta2007-11-141-8/+9
| | | | | | | | | | Tweak the "filter" section of the gitattributes documentation to add some missing articles and improve some word choices without changing the semantics of the section. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* gitattributes.txt: Be more to the point in the filter driver description.Johannes Sixt2007-09-251-5/+4
| | | | | | | | | The description was meant to emphasizes that the project should remain usable even if the filter driver was not used. This makes it more explicit and removes the "here is rope to hang yourself" paraphrase. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' ↵Johannes Sixt2007-09-251-11/+0
| | | | | | | | | | interaction. The order in which 'ident' and 'crlf' are carried out is documented a few paragraphs later again, after 'filter' was introduced. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation: Correct various misspellings and typos.Brian Hetro2007-08-241-3/+3
| | | | | | | Fix minor typos throughout the documentation. Signed-off-by: Brian Hetro <whee@smaertness.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Documentation/gitattributes.txt: typofixDavid Soria Parra2007-07-301-1/+1
| | | | | | | The file used for per-repository attribute setting is not $GIT_DIR/info/gitattributes, but $GIT_DIR/info/attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Document custom hunk header selectionJunio C Hamano2007-07-081-4/+51
| | | | | | | | Since the external interface seems to have stabilized for this new feature, let's document it properly. Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent ↵Andy Parkins2007-05-141-3/+3
| | | | | | | | | | | | | | | | | | | with other VCSs $Id$ is present already in SVN and CVS; it would mean that people converting their existing repositories won't have to make any changes to the source files should they want to make use of the ident attribute. Given that it's a feature that's meant to calm those very people, it seems obtuse to make them edit every file just to make use of it. I think that bzr uses $Id$; Mercurial has examples hooks for $Id$; monotone has $Id$ on its wishlist. I can't think of a good reason not to stick with the de-facto standard and call ours $Id$ instead of $ident$. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add 'filter' attribute and external filter driver definition.Junio C Hamano2007-04-241-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | The interface is similar to the custom low-level merge drivers. First you configure your filter driver by defining 'filter.<name>.*' variables in the configuration. filter.<name>.clean filter command to run upon checkin filter.<name>.smudge filter command to run upon checkout Then you assign filter attribute to each path, whose name matches the custom filter driver's name. Example: (in .gitattributes) *.c filter=indent (in config) [filter "indent"] clean = indent smudge = cat Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add 'ident' conversion.Junio C Hamano2007-04-241-2/+29
| | | | | | | | | | | The 'ident' attribute set to path squashes "$ident:<any bytes except dollor sign>$" to "$ident$" upon checkin, and expands it to "$ident: <blob SHA-1> $" upon checkout. As we have two conversions that affect checkin/checkout paths, clarify how they interact with each other. Signed-off-by: Junio C Hamano <junkio@cox.net>
* gitattributes documentation: clarify overridingJunio C Hamano2007-04-241-3/+5
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document "diff=driver" attributeJunio C Hamano2007-04-231-3/+29
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation/Makefile: fix section (5) installationJunio C Hamano2007-04-221-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document gitattributes(5)Junio C Hamano2007-04-191-0/+285
Signed-off-by: Junio C Hamano <junkio@cox.net>