summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
AgeCommit message (Expand)Author
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-08-17Userdiff patterns for C#Petr Onderka
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen
2010-06-21Merge branch 'eb/core-eol'Junio C Hamano
2010-06-07Add "core.eol" config variableEyvind Bernhardsen
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano
2010-05-20Rename the "crlf" attribute "text"Eyvind Bernhardsen
2010-05-20Add per-repository eol normalizationEyvind Bernhardsen
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast
2010-04-02diff: cache textconv outputJeff King
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg
2010-01-21conflict-marker-size: add test and docsJunio C Hamano
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2009-12-15Illustrate "filter" attribute with an exampleNanako Shiraishi
2009-10-21Document `delta` attribute in "git help attributes".Nasser Grainawi
2009-08-12Change mentions of "git programs" to "git commands"Ori Avtalion
2009-04-18doc/gitattributes: clarify location of config textJeff King
2009-04-08Merge branch 'maint-1.6.1' into maintJunio C Hamano
2009-04-08Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano
2009-04-08Documentation: clarify .gitattributes searchJason Merrill
2009-02-25gitattributes.txt: Path matching rules are explained in gitignore.txtJohannes Sixt
2009-01-22Change the spelling of "wordregex".Boyd Stephen Smith Jr
2009-01-17color-words: make regex configurable via attributesThomas Rast
2008-11-15Documentation: New GUI configuration and command-line options.Alexander Gavrilov
2008-11-13Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano
2008-11-02Merge branch 'maint'Junio C Hamano
2008-11-02Documentation/gitattributes: Add subsection header for each attributeJakub Narebski
2008-10-31Merge branch 'maint'Junio C Hamano
2008-10-31Documentation: clarify information about 'ident' attributeJan Kr├╝ger
2008-10-26document the diff driver textconv featureJeff King
2008-10-06Teach git diff about Objective-C syntaxJonathan del Strother
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano
2008-09-19diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey
2008-09-19Clarified gitattributes documentation regarding custom hunk header.Garry Dolley
2008-09-12Fix some manual typos.Ralf Wildenhues
2008-09-07Teach "git diff -p" to locate PHP class methodsAndreas Ericsson
2008-08-31Merge branch 'maint'Junio C Hamano
2008-08-31Document clarification: gitmodules, gitattributesGustaf Hendeby
2008-08-31Merge branch 'maint'Junio C Hamano
2008-08-31gitattributes: -crlf is not binaryJunio C Hamano
2008-08-21Teach "git diff -p" HTML funcname patternsJohan Herland
2008-08-21Teach "git diff -p" Python funcname patternsKirill Smelkov
2008-08-12Teach git diff about BibTeX head hunk patternsGustaf Hendeby
2008-08-12gitattributes: Document built in hunk header patternsGustaf Hendeby
2008-07-06Merge branch 'qq/maint'Junio C Hamano
2008-07-06attribute documentation: keep EXAMPLE at endJunio C Hamano
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder