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