summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAgeFilesLines
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-011-36/+36
* Merge branch 'nd/attr-match-optim-more'Jeff King2012-11-091-0/+1
|\
| * attr: more matching optimizations from .gitignoreNguyễn Thái Ngọc Duy2012-10-151-0/+1
* | Sync with maintJunio C Hamano2012-10-101-0/+5
|\ \
| * | attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy2012-10-101-0/+5
* | | Merge branch 'aj/xfuncname-ada'Junio C Hamano2012-09-251-0/+2
|\ \ \
| * | | Add userdiff patterns for AdaAdrian Johnson2012-09-161-0/+2
| |/ /
* | | Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-141-1/+1
|\ \ \ | |/ / |/| |
| * | attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-081-1/+1
* | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen2012-06-251-0/+2
| |/ |/|
* | Add a setting to require a filter to be successfuljb/required-filterJehan Bing2012-02-171-10/+31
|/
* Add built-in diff patterns for MATLAB codegh/userdiff-matlabGustaf Hendeby2011-11-151-0/+2
* Merge branch 'mh/check-attr-relative'Junio C Hamano2011-08-171-0/+3
|\
| * doc: Add a link from gitattributes(5) to git-check-attr(1)Michael Haggerty2011-08-041-0/+3
* | gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty2011-08-031-9/+9
* | gitattributes: Clarify discussion of attribute macrosMichael Haggerty2011-08-031-5/+8
|/
* doc: discuss textconv versus external diff driversJeff King2011-05-241-0/+31
* docs: fix grammar in gitattributes.txtAlexei Sholik2011-03-181-5/+5
* Merge branch 'jn/perl-funcname'Junio C Hamano2011-01-131-0/+2
|\
| * diff: funcname and word patterns for perlJonathan Nieder2010-12-271-0/+2
* | Merge branch 'jk/diff-driver-binary-doc'Junio C Hamano2011-01-131-0/+33
|\ \
| * | docs: explain diff.*.binary optionJeff King2011-01-101-0/+33
* | | convert filter: supply path to external driverPete Wyckoff2010-12-221-0/+10
| |/ |/|
* | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-011-2/+4
* | Merge branch 'bc/fortran-userdiff'Junio C Hamano2010-09-291-0/+2
|\ \
| * | userdiff.c: add builtin fortran regex patternsBrandon Casey2010-09-101-0/+2
* | | Merge branch 'po/etc-gitattributes'Junio C Hamano2010-09-291-3/+10
|\ \ \ | |/ / |/| |
| * | Add global and system-wide gitattributesPetr Onderka2010-09-011-3/+10
* | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+34
|\ \ \
| * | | Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+34
| |/ /
* | | Userdiff patterns for C#Petr Onderka2010-08-161-0/+2
|/ /
* | Merge branch 'eb/core-eol'Junio C Hamano2010-06-211-32/+133
|\ \
| * | Add "core.eol" config variableEyvind Bernhardsen2010-06-061-13/+15
| * | Rename the "crlf" attribute "text"Eyvind Bernhardsen2010-05-191-24/+35
| * | Add per-repository eol normalizationEyvind Bernhardsen2010-05-191-25/+113
* | | Merge branch 'tr/word-diff'Junio C Hamano2010-05-211-1/+1
|\ \ \
| * | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-141-1/+1
| | |/ | |/|
* | | diff: cache textconv outputJeff King2010-04-021-0/+20
|/ /
* | 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
View Lorry Controller Status