aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAge
* Merge branch 'bc/fortran-userdiff'Junio C Hamano2010-09-29
|\
| * userdiff.c: add builtin fortran regex patternsBrandon Casey2010-09-10
* | Merge branch 'po/etc-gitattributes'Junio C Hamano2010-09-29
|\ \ | |/ |/|
| * Add global and system-wide gitattributesPetr Onderka2010-09-01
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \
| * | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-02
| |/
* | Userdiff patterns for C#Petr Onderka2010-08-16
|/
* Merge branch 'eb/core-eol'Junio C Hamano2010-06-21
|\
| * Add "core.eol" config variableEyvind Bernhardsen2010-06-06
| * Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-19
| * Add per-repository eol normalizationEyvind Bernhardsen2010-05-19
* | Merge branch 'tr/word-diff'Junio C Hamano2010-05-21
|\ \
| * | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-14
* | | diff: cache textconv outputJeff King2010-04-02
|/ /
* | Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg2010-02-23
|/
* conflict-marker-size: add test and docsJunio C Hamano2010-01-20
* Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
* Illustrate "filter" attribute with an exampleNanako Shiraishi2009-12-14
* Document `delta` attribute in "git help attributes".Nasser Grainawi2009-10-21
* Change mentions of "git programs" to "git commands"Ori Avtalion2009-08-12
* doc/gitattributes: clarify location of config textJeff King2009-04-17
* Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-07
|\
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-07
| |\
| | * Documentation: clarify .gitattributes searchJason Merrill2009-04-07
* | | gitattributes.txt: Path matching rules are explained in gitignore.txtJohannes Sixt2009-02-25
* | | Change the spelling of "wordregex".Boyd Stephen Smith Jr2009-01-21
* | | color-words: make regex configurable via attributesThomas Rast2009-01-17
|/ /
* | Documentation: New GUI configuration and command-line options.Alexander Gavrilov2008-11-14
* | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-12
|\ \
| * | document the diff driver textconv featureJeff King2008-10-26
* | | Merge branch 'maint'Junio C Hamano2008-11-02
|\ \ \ | | |/ | |/|
| * | Documentation/gitattributes: Add subsection header for each attributeJakub Narebski2008-11-01
* | | Merge branch 'maint'Junio C Hamano2008-10-31
|\ \ \ | |/ / | | / | |/ |/|
| * Documentation: clarify information about 'ident' attributeJan Krüger2008-10-31
* | Teach git diff about Objective-C syntaxJonathan del Strother2008-10-06
* | Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce2008-09-29
|\ \ | |/
| * Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-29
| |\
| * | Clarified gitattributes documentation regarding custom hunk header.Garry Dolley2008-09-18
* | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18
|\ \ \ | | |/ | |/|
| * | diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-18
| |/
| * Fix some manual typos.Ralf Wildenhues2008-09-12
* | Teach "git diff -p" to locate PHP class methodsAndreas Ericsson2008-09-07
* | Merge branch 'maint'Junio C Hamano2008-08-31
|\ \ | |/
| * Document clarification: gitmodules, gitattributesGustaf Hendeby2008-08-31
* | Merge branch 'maint'Junio C Hamano2008-08-30
|\ \ | |/
| * gitattributes: -crlf is not binaryJunio C Hamano2008-08-30
* | Teach "git diff -p" HTML funcname patternsJohan Herland2008-08-20
* | Teach "git diff -p" Python funcname patternsKirill Smelkov2008-08-20
|/
* Teach git diff about BibTeX head hunk patternsGustaf Hendeby2008-08-12
* gitattributes: Document built in hunk header patternsGustaf Hendeby2008-08-12