summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAgeFilesLines
* Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg2010-02-231-1/+2
* conflict-marker-size: add test and docsJunio C Hamano2010-01-201-0/+17
* Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-6/+6
* Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-141-0/+19
* Document `delta` attribute in "git help attributes".Nasser Grainawi2009-10-211-0/+10
* Change mentions of "git programs" to "git commands"Ori Avtalion2009-08-121-1/+1
* doc/gitattributes: clarify location of config textJeff King2009-04-171-3/+6
* Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-071-3/+3
|\
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-071-3/+3
| |\
| | * Documentation: clarify .gitattributes searchJason Merrill2009-04-071-3/+3
* | | gitattributes.txt: Path matching rules are explained in gitignore.txtJohannes Sixt2009-02-251-6/+7
* | | Change the spelling of "wordregex".Boyd Stephen Smith Jr2009-01-211-2/+2
* | | color-words: make regex configurable via attributesThomas Rast2009-01-171-0/+21
|/ /
* | Documentation: New GUI configuration and command-line options.Alexander Gavrilov2008-11-141-0/+17
* | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-121-13/+53
|\ \
| * | document the diff driver textconv featureJeff King2008-10-261-13/+53
* | | Merge branch 'maint'Junio C Hamano2008-11-021-0/+6
|\ \ \ | | |/ | |/|
| * | Documentation/gitattributes: Add subsection header for each attributeJakub Narebski2008-11-011-0/+6
* | | Merge branch 'maint'Junio C Hamano2008-10-311-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Documentation: clarify information about 'ident' attributeJan Krüger2008-10-311-2/+2
* | Teach git diff about Objective-C syntaxJonathan del Strother2008-10-061-0/+2
* | Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-291-9/+9
|\ \ | |/
| * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-291-2/+2
| |\
| * | Clarified gitattributes documentation regarding custom hunk header.Garry Dolley2008-09-181-9/+9
* | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-181-3/+3
|\ \ \ | | |/ | |/|
| * | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-181-2/+2
| |/
| * Fix some manual typos.Ralf Wildenhues2008-09-121-1/+1
* | Teach "git diff -p" to locate PHP class methodsAndreas Ericsson2008-09-071-2/+4
* | Merge branch 'maint'Junio C Hamano2008-08-311-1/+1
|\ \ | |/
| * Document clarification: gitmodules, gitattributesGustaf Hendeby2008-08-311-1/+1
* | Merge branch 'maint'Junio C Hamano2008-08-301-3/+37
|\ \ | |/
| * gitattributes: -crlf is not binaryJunio C Hamano2008-08-301-3/+37
* | Teach "git diff -p" HTML funcname patternsJohan Herland2008-08-201-0/+2
* | Teach "git diff -p" Python funcname patternsKirill Smelkov2008-08-201-0/+2
|/
* Teach git diff about BibTeX head hunk patternsGustaf Hendeby2008-08-121-0/+2
* gitattributes: Document built in hunk header patternsGustaf Hendeby2008-08-121-3/+10
* Merge branch 'qq/maint'Junio C Hamano2008-07-051-22/+23
|\
| * attribute documentation: keep EXAMPLE at endJunio C Hamano2008-07-051-16/+17
* | manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder2008-07-051-3/+3
* | manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-8/+8
* | Documentation formatting and cleanupJonathan Nieder2008-07-011-6/+6
* | Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-7/+7
* | Teach new attribute 'export-ignore' to git-archiveRené Scharfe2008-06-091-0/+6
|/
* documentation: move git(7) to git(1)Christian Couder2008-06-061-2/+2
* Merge branch 'maint'Junio C Hamano2008-03-271-0/+7
|\
| * Documentation: clarify use of .git{ignore,attributes} versus .git/info/*Jeff King2008-03-271-0/+7
* | safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska2008-02-061-0/+20
|/
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-5/+5
* Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-221-3/+34
* Merge branch 'jc/spht'Junio C Hamano2007-12-091-0/+31
|\
View Lorry Controller Status