summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
AgeCommit message (Expand)AuthorFilesLines
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
2008-10-31Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2008-10-31Documentation: clarify information about 'ident' attributeLibravatar Jan Krüger1-2/+2
2008-10-26document the diff driver textconv featureLibravatar Jeff King1-13/+53
2008-10-06Teach git diff about Objective-C syntaxLibravatar Jonathan del Strother1-0/+2
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixLibravatar Shawn O. Pearce1-9/+9
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintLibravatar Shawn O. Pearce1-2/+2
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-3/+3
2008-09-18diff.*.xfuncname which uses "extended" regex's for hunk header selectionLibravatar Brandon Casey1-2/+2
2008-09-18Clarified gitattributes documentation regarding custom hunk header.Libravatar Garry Dolley1-9/+9
2008-09-12Fix some manual typos.Libravatar Ralf Wildenhues1-1/+1
2008-09-07Teach "git diff -p" to locate PHP class methodsLibravatar Andreas Ericsson1-2/+4
2008-08-31Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-08-31Document clarification: gitmodules, gitattributesLibravatar Gustaf Hendeby1-1/+1
2008-08-30Merge branch 'maint'Libravatar Junio C Hamano1-3/+37
2008-08-30gitattributes: -crlf is not binaryLibravatar Junio C Hamano1-3/+37
2008-08-20Teach "git diff -p" HTML funcname patternsLibravatar Johan Herland1-0/+2
2008-08-20Teach "git diff -p" Python funcname patternsLibravatar Kirill Smelkov1-0/+2
2008-08-12Teach git diff about BibTeX head hunk patternsLibravatar Gustaf Hendeby1-0/+2
2008-08-12gitattributes: Document built in hunk header patternsLibravatar Gustaf Hendeby1-3/+10
2008-07-05Merge branch 'qq/maint'Libravatar Junio C Hamano1-22/+23
2008-07-05attribute documentation: keep EXAMPLE at endLibravatar Junio C Hamano1-16/+17
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Libravatar Jonathan Nieder1-3/+3
2008-07-05manpages: italicize git command names (which were in teletype font)Libravatar Jonathan Nieder1-8/+8
2008-07-01Documentation formatting and cleanupLibravatar Jonathan Nieder1-6/+6
2008-07-01Documentation: be consistent about "git-" versus "git "Libravatar Jonathan Nieder1-7/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 07:53:03 +0000