aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt (follow)
AgeCommit message (Expand)AuthorFilesLines
2014-11-04Documentation: typofixesThomas Ackermann1-2/+2
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy1-2/+2
2014-01-14gitattributes: document more clearly where macros are allowedMichael Haggerty1-3/+6
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-36/+36
2012-11-09Merge branch 'nd/attr-match-optim-more'Jeff King1-0/+1
2012-10-15attr: more matching optimizations from .gitignoreNguyễn Thái Ngọc Duy1-0/+1
2012-10-10Sync with maintJunio C Hamano1-0/+5
2012-10-10attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy1-0/+5
2012-09-25Merge branch 'aj/xfuncname-ada'Junio C Hamano1-0/+2
2012-09-16Add userdiff patterns for AdaAdrian Johnson1-0/+2
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano1-1/+1
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano1-1/+1
2012-06-25Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen1-0/+2
2012-02-17Add a setting to require a filter to be successfulJehan Bing1-10/+31
2011-11-15Add built-in diff patterns for MATLAB codeGustaf Hendeby1-0/+2
2011-08-17Merge branch 'mh/check-attr-relative'Junio C Hamano1-0/+3
2011-08-04doc: Add a link from gitattributes(5) to git-check-attr(1)Michael Haggerty1-0/+3
2011-08-03gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty1-9/+9
2011-08-03gitattributes: Clarify discussion of attribute macrosMichael Haggerty1-5/+8
2011-05-24doc: discuss textconv versus external diff driversJeff King1-0/+31
2011-03-18docs: fix grammar in gitattributes.txtAlexei Sholik1-5/+5
2011-01-13Merge branch 'jn/perl-funcname'Junio C Hamano1-0/+2
2011-01-13Merge branch 'jk/diff-driver-binary-doc'Junio C Hamano1-0/+33
2011-01-10docs: explain diff.*.binary optionJeff King1-0/+33
2010-12-27diff: funcname and word patterns for perlJonathan Nieder1-0/+2
2010-12-22convert filter: supply path to external driverPete Wyckoff1-0/+10
2010-12-01Make the tab width used for whitespace checks configurableJohannes Sixt1-2/+4
2010-09-29Merge branch 'bc/fortran-userdiff'Junio C Hamano1-0/+2
2010-09-29Merge branch 'po/etc-gitattributes'Junio C Hamano1-3/+10
2010-09-10userdiff.c: add builtin fortran regex patternsBrandon Casey1-0/+2
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-0/+34
2010-09-01Add global and system-wide gitattributesPetr Onderka1-3/+10
2010-08-16Userdiff patterns for C#Petr Onderka1-0/+2
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen1-0/+34
2010-06-21Merge branch 'eb/core-eol'Junio C Hamano1-32/+133
2010-06-06Add "core.eol" config variableEyvind Bernhardsen1-13/+15
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano1-1/+1
2010-05-19Rename the "crlf" attribute "text"Eyvind Bernhardsen1-24/+35
2010-05-19Add per-repository eol normalizationEyvind Bernhardsen1-25/+113
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast1-1/+1
2010-04-02diff: cache textconv outputJeff King1-0/+20
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg1-1/+2
2010-01-20conflict-marker-size: add test and docsJunio C Hamano1-0/+17
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-6/+6
2009-12-14Illustrate "filter" attribute with an exampleNanako Shiraishi1-0/+19
2009-10-21Document `delta` attribute in "git help attributes".Nasser Grainawi1-0/+10
2009-08-12Change mentions of "git programs" to "git commands"Ori Avtalion1-1/+1
2009-04-17doc/gitattributes: clarify location of config textJeff King1-3/+6
2009-04-07Merge branch 'maint-1.6.1' into maintJunio C Hamano1-3/+3
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-3/+3