aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAge
* Merge branch 'jc/ll-merge-binary-ours' into maintJunio C Hamano2012-10-17
|\
| * attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-08
* | attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy2012-10-10
* | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen2012-06-25
* | Add a setting to require a filter to be successfulJehan Bing2012-02-17
|/
* Add built-in diff patterns for MATLAB codeGustaf Hendeby2011-11-15
* Merge branch 'mh/check-attr-relative'Junio C Hamano2011-08-17
|\
| * doc: Add a link from gitattributes(5) to git-check-attr(1)Michael Haggerty2011-08-04
* | gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty2011-08-03
* | gitattributes: Clarify discussion of attribute macrosMichael Haggerty2011-08-03
|/
* doc: discuss textconv versus external diff driversJeff King2011-05-24
* docs: fix grammar in gitattributes.txtAlexei Sholik2011-03-18
* Merge branch 'jn/perl-funcname'Junio C Hamano2011-01-13
|\
| * diff: funcname and word patterns for perlJonathan Nieder2010-12-27
* | Merge branch 'jk/diff-driver-binary-doc'Junio C Hamano2011-01-13
|\ \
| * | docs: explain diff.*.binary optionJeff King2011-01-10
* | | convert filter: supply path to external driverPete Wyckoff2010-12-22
| |/ |/|
* | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-01
* | 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
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 07:24:08 +0000