summaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt
AgeCommit message (Expand)AuthorLines
2018-06-01Merge branch 'nd/command-list'Junio C Hamano-1/+1
2018-05-23Merge branch 'nd/doc-header'Junio C Hamano-2/+2
2018-05-21help: use command-list.txt for the source of guidesNguyễn Thái Ngọc Duy-1/+1
2018-05-08Merge branch 'ls/checkout-encoding'Junio C Hamano-0/+88
2018-05-02doc: keep first level section header in upper caseNguyễn Thái Ngọc Duy-2/+2
2018-04-16convert: add round trip check based on 'core.checkRoundtripEncoding'Lars Schneider-0/+8
2018-04-16convert: add 'working-tree-encoding' attributeLars Schneider-0/+80
2018-03-21Merge branch 'jk/attributes-path-doc'Junio C Hamano-3/+10
2018-03-20doc/gitattributes: mention non-recursive behaviorJeff King-3/+10
2018-03-01userdiff: add built-in pattern for golangAlban Gruin-0/+2
2018-01-25Docs: split out long-running subprocess handshakeJonathan Tan-46/+8
2017-11-17add: introduce "--renormalize"Torsten Bögershausen-2/+4
2017-09-07Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel-1/+4
2017-07-26Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano-4/+65
2017-06-30convert: add "status=delayed" to filter process protocolLars Schneider-4/+65
2017-06-15doc: do not use `rm .git/index` when normalizing line endingsAndreas Heiduk-1/+1
2017-04-23Merge branch 'tb/doc-eol-normalization'Junio C Hamano-4/+2
2017-04-13gitattributes.txt: document how to normalize the line endingsTorsten Bögershausen-4/+2
2017-02-01Documentation: fix a typoStefan Beller-1/+1
2017-02-01attr: support quoting pathname patterns in C styleNguyễn Thái Ngọc Duy-3/+5
2016-12-06docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider-1/+3
2016-10-17contrib/long-running-filter: add long running filter exampleLars Schneider-1/+3
2016-10-17convert: add filter.<driver>.process optionLars Schneider-1/+154
2016-08-26gitattributes: Document the unified "auto" handlingTorsten Bögershausen-34/+24
2016-08-11Spelling fixesVille Skyttä-1/+1
2016-08-08Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano-0/+5
2016-08-03clarify %f documentationJoey Hess-0/+5
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano-6/+9
2016-07-06convert: unify the "auto" handling of CRLFTorsten Bögershausen-6/+9
2016-06-03userdiff: add built-in pattern for CSSWilliam Duclot-0/+2
2015-07-23userdiff: add support for Fountain documentsZoë Blade-0/+2
2015-06-24Merge branch 'jc/ll-merge-expose-path'Junio C Hamano-1/+4
2015-06-04ll-merge: pass the original path to external driversJunio C Hamano-1/+4
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy-1/+1
2014-11-04Documentation: typofixesThomas Ackermann-2/+2
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy-2/+2
2014-01-14gitattributes: document more clearly where macros are allowedMichael Haggerty-3/+6
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann-36/+36
2012-11-09Merge branch 'nd/attr-match-optim-more'Jeff King-0/+1
2012-10-15attr: more matching optimizations from .gitignoreNguyễn Thái Ngọc Duy-0/+1
2012-10-10Sync with maintJunio C Hamano-0/+5
2012-10-10attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy-0/+5
2012-09-25Merge branch 'aj/xfuncname-ada'Junio C Hamano-0/+2
2012-09-16Add userdiff patterns for AdaAdrian Johnson-0/+2
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano-1/+1
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano-1/+1
2012-06-25Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen-0/+2
2012-02-17Add a setting to require a filter to be successfulJehan Bing-10/+31
2011-11-15Add built-in diff patterns for MATLAB codeGustaf Hendeby-0/+2
2011-08-17Merge branch 'mh/check-attr-relative'Junio C Hamano-0/+3