aboutsummaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAge
* docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-06
* contrib/long-running-filter: add long running filter exampleLars Schneider2016-10-17
* convert: add filter.<driver>.process optionLars Schneider2016-10-17
* gitattributes: Document the unified "auto" handlingTorsten Bögershausen2016-08-26
* Spelling fixesVille Skyttä2016-08-11
* Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano2016-08-08
|\
| * clarify %f documentationJoey Hess2016-08-03
* | Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano2016-07-25
|\ \
| * | convert: unify the "auto" handling of CRLFTorsten Bögershausen2016-07-06
| |/
* | userdiff: add built-in pattern for CSSWilliam Duclot2016-06-03
|/
* userdiff: add support for Fountain documentsZoë Blade2015-07-23
* Merge branch 'jc/ll-merge-expose-path'Junio C Hamano2015-06-24
|\
| * ll-merge: pass the original path to external driversJunio C Hamano2015-06-04
* | *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-13
|/
* Documentation: typofixesThomas Ackermann2014-11-04
* diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy2014-08-18
* gitattributes: document more clearly where macros are allowedMichael Haggerty2014-01-14
* Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann2013-02-01
* Merge branch 'nd/attr-match-optim-more'Jeff King2012-11-09
|\
| * attr: more matching optimizations from .gitignoreNguyễn Thái Ngọc Duy2012-10-15
* | Sync with maintJunio C Hamano2012-10-10
|\ \
| * | attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy2012-10-10
* | | Merge branch 'aj/xfuncname-ada'Junio C Hamano2012-09-25
|\ \ \
| * | | Add userdiff patterns for AdaAdrian Johnson2012-09-16
| |/ /
* | | Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-14
|\ \ \ | |/ / |/| |
| * | attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano2012-09-08
* | | 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