aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt (follow)
AgeCommit message (Expand)AuthorFilesLines
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
2009-04-07Documentation: clarify .gitattributes searchJason Merrill1-3/+3
2009-02-25gitattributes.txt: Path matching rules are explained in gitignore.txtJohannes Sixt1-6/+7
2009-01-21Change the spelling of "wordregex".Boyd Stephen Smith Jr1-2/+2
2009-01-17color-words: make regex configurable via attributesThomas Rast1-0/+21
2008-11-14Documentation: New GUI configuration and command-line options.Alexander Gavrilov1-0/+17
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano1-13/+53
2008-11-02Merge branch 'maint'Junio C Hamano1-0/+6
2008-11-01Documentation/gitattributes: Add subsection header for each attributeJakub Narebski1-0/+6
2008-10-31Merge branch 'maint'Junio C Hamano1-2/+2
2008-10-31Documentation: clarify information about 'ident' attributeJan Krüger1-2/+2
2008-10-26document the diff driver textconv featureJeff King1-13/+53
2008-10-06Teach git diff about Objective-C syntaxJonathan del Strother1-0/+2
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce1-9/+9
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce1-2/+2
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-3/+3
2008-09-18diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey1-2/+2
2008-09-18Clarified gitattributes documentation regarding custom hunk header.Garry Dolley1-9/+9
2008-09-12Fix some manual typos.Ralf Wildenhues1-1/+1
2008-09-07Teach "git diff -p" to locate PHP class methodsAndreas Ericsson1-2/+4
2008-08-31Merge branch 'maint'Junio C Hamano1-1/+1
2008-08-31Document clarification: gitmodules, gitattributesGustaf Hendeby1-1/+1
2008-08-30Merge branch 'maint'Junio C Hamano1-3/+37
2008-08-30gitattributes: -crlf is not binaryJunio C Hamano1-3/+37
2008-08-20Teach "git diff -p" HTML funcname patternsJohan Herland1-0/+2
2008-08-20Teach "git diff -p" Python funcname patternsKirill Smelkov1-0/+2