summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
AgeCommit message (Expand)AuthorFilesLines
2012-09-25Merge branch 'aj/xfuncname-ada'Libravatar Junio C Hamano1-0/+2
2012-09-16Add userdiff patterns for AdaLibravatar Adrian Johnson1-0/+2
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Libravatar Junio C Hamano1-1/+1
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverLibravatar Junio C Hamano1-1/+1
2012-06-25Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesLibravatar Huynh Khoi Nguyen Nguyen1-0/+2
2012-02-17Add a setting to require a filter to be successfulLibravatar Jehan Bing1-10/+31
2011-11-15Add built-in diff patterns for MATLAB codeLibravatar Gustaf Hendeby1-0/+2
2011-08-17Merge branch 'mh/check-attr-relative'Libravatar Junio C Hamano1-0/+3
2011-08-04doc: Add a link from gitattributes(5) to git-check-attr(1)Libravatar Michael Haggerty1-0/+3
2011-08-03gitattributes: Reword "attribute macro" to "macro attribute"Libravatar Michael Haggerty1-9/+9
2011-08-03gitattributes: Clarify discussion of attribute macrosLibravatar Michael Haggerty1-5/+8
2011-05-24doc: discuss textconv versus external diff driversLibravatar Jeff King1-0/+31
2011-03-18docs: fix grammar in gitattributes.txtLibravatar Alexei Sholik1-5/+5
2011-01-13Merge branch 'jn/perl-funcname'Libravatar Junio C Hamano1-0/+2
2011-01-13Merge branch 'jk/diff-driver-binary-doc'Libravatar Junio C Hamano1-0/+33
2011-01-10docs: explain diff.*.binary optionLibravatar Jeff King1-0/+33
2010-12-27diff: funcname and word patterns for perlLibravatar Jonathan Nieder1-0/+2
2010-12-22convert filter: supply path to external driverLibravatar Pete Wyckoff1-0/+10
2010-12-01Make the tab width used for whitespace checks configurableLibravatar Johannes Sixt1-2/+4
2010-09-29Merge branch 'bc/fortran-userdiff'Libravatar Junio C Hamano1-0/+2
2010-09-29Merge branch 'po/etc-gitattributes'Libravatar Junio C Hamano1-3/+10
2010-09-10userdiff.c: add builtin fortran regex patternsLibravatar Brandon Casey1-0/+2
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+34
2010-09-01Add global and system-wide gitattributesLibravatar Petr Onderka1-3/+10
2010-08-16Userdiff patterns for C#Libravatar Petr Onderka1-0/+2
2010-07-02Avoid conflicts when merging branches with mixed normalizationLibravatar Eyvind Bernhardsen1-0/+34
2010-06-21Merge branch 'eb/core-eol'Libravatar Junio C Hamano1-32/+133
2010-06-06Add "core.eol" config variableLibravatar Eyvind Bernhardsen1-13/+15
2010-05-21Merge branch 'tr/word-diff'Libravatar Junio C Hamano1-1/+1
2010-05-19Rename the "crlf" attribute "text"Libravatar Eyvind Bernhardsen1-24/+35
2010-05-19Add per-repository eol normalizationLibravatar Eyvind Bernhardsen1-25/+113
2010-04-14diff: add --word-diff option that generalizes --color-wordsLibravatar Thomas Rast1-1/+1
2010-04-02diff: cache textconv outputLibravatar Jeff King1-0/+20
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverLibravatar Bert Wesarg1-1/+2
2010-01-20conflict-marker-size: add test and docsLibravatar Junio C Hamano1-0/+17
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-6/+6
2009-12-14Illustrate "filter" attribute with an exampleLibravatar Nanako Shiraishi1-0/+19
2009-10-21Document `delta` attribute in "git help attributes".Libravatar Nasser Grainawi1-0/+10
2009-08-12Change mentions of "git programs" to "git commands"Libravatar Ori Avtalion1-1/+1
2009-04-17doc/gitattributes: clarify location of config textLibravatar Jeff King1-3/+6
2009-04-07Merge branch 'maint-1.6.1' into maintLibravatar Junio C Hamano1-3/+3
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-3/+3
2009-04-07Documentation: clarify .gitattributes searchLibravatar Jason Merrill1-3/+3
2009-02-25gitattributes.txt: Path matching rules are explained in gitignore.txtLibravatar Johannes Sixt1-6/+7
2009-01-21Change the spelling of "wordregex".Libravatar Boyd Stephen Smith Jr1-2/+2
2009-01-17color-words: make regex configurable via attributesLibravatar Thomas Rast1-0/+21
2008-11-14Documentation: New GUI configuration and command-line options.Libravatar Alexander Gavrilov1-0/+17
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Libravatar Junio C Hamano1-13/+53
2008-11-02Merge branch 'maint'Libravatar Junio C Hamano1-0/+6
2008-11-01Documentation/gitattributes: Add subsection header for each attributeLibravatar Jakub Narebski1-0/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 04:59:47 +0000