summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAgeFilesLines
* Spelling fixesvs/typofixVille Skyttä2016-08-111-1/+1
* Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano2016-08-081-0/+5
|\
| * clarify %f documentationjh/clean-smudge-f-docJoey Hess2016-08-031-0/+5
* | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-251-6/+9
|\ \
| * | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-061-6/+9
| |/
* | userdiff: add built-in pattern for CSSwd/userdiff-cssWilliam Duclot2016-06-031-0/+2
|/
* userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-231-0/+2
* Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-241-1/+4
|\
| * ll-merge: pass the original path to external driversjc/ll-merge-expose-pathJunio C Hamano2015-06-041-1/+4
* | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCaseNguyễn Thái Ngọc Duy2015-03-131-1/+1
|/
* Documentation: typofixesThomas Ackermann2014-11-041-2/+2
* diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-181-2/+2
* gitattributes: document more clearly where macros are allowedmh/attr-macro-docMichael Haggerty2014-01-141-3/+6
* 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
| | |/ | |/|
View Lorry Controller Status