summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
AgeCommit message (Expand)AuthorFilesLines
2018-05-08Merge branch 'ls/checkout-encoding'Libravatar Junio C Hamano1-0/+88
2018-04-16convert: add round trip check based on 'core.checkRoundtripEncoding'Libravatar Lars Schneider1-0/+8
2018-04-16convert: add 'working-tree-encoding' attributeLibravatar Lars Schneider1-0/+80
2018-03-21Merge branch 'jk/attributes-path-doc'Libravatar Junio C Hamano1-3/+10
2018-03-20doc/gitattributes: mention non-recursive behaviorLibravatar Jeff King1-3/+10
2018-03-01userdiff: add built-in pattern for golangLibravatar Alban Gruin1-0/+2
2018-01-25Docs: split out long-running subprocess handshakeLibravatar Jonathan Tan1-46/+8
2017-11-17add: introduce "--renormalize"Libravatar Torsten Bögershausen1-2/+4
2017-09-07Documentation: mention that `eol` can change the dirty status of pathsLibravatar Ben Boeckel1-1/+4
2017-07-26Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeLibravatar Junio C Hamano1-4/+65
2017-06-30convert: add "status=delayed" to filter process protocolLibravatar Lars Schneider1-4/+65
2017-06-15doc: do not use `rm .git/index` when normalizing line endingsLibravatar Andreas Heiduk1-1/+1
2017-04-23Merge branch 'tb/doc-eol-normalization'Libravatar Junio C Hamano1-4/+2
2017-04-13gitattributes.txt: document how to normalize the line endingsLibravatar Torsten Bögershausen1-4/+2
2017-02-01Documentation: fix a typoLibravatar Stefan Beller1-1/+1
2017-02-01attr: support quoting pathname patterns in C styleLibravatar Nguyễn Thái Ngọc Duy1-3/+5
2016-12-06docs: warn about possible '=' in clean/smudge filter process valuesLibravatar Lars Schneider1-1/+3
2016-10-17contrib/long-running-filter: add long running filter exampleLibravatar Lars Schneider1-1/+3
2016-10-17convert: add filter.<driver>.process optionLibravatar Lars Schneider1-1/+154
2016-08-26gitattributes: Document the unified "auto" handlingLibravatar Torsten Bögershausen1-34/+24
2016-08-11Spelling fixesLibravatar Ville Skyttä1-1/+1
2016-08-08Merge branch 'jh/clean-smudge-f-doc'Libravatar Junio C Hamano1-0/+5
2016-08-03clarify %f documentationLibravatar Joey Hess1-0/+5
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Libravatar Junio C Hamano1-6/+9
2016-07-06convert: unify the "auto" handling of CRLFLibravatar Torsten Bögershausen1-6/+9
2016-06-03userdiff: add built-in pattern for CSSLibravatar William Duclot1-0/+2
2015-07-23userdiff: add support for Fountain documentsLibravatar Zoë Blade1-0/+2
2015-06-24Merge branch 'jc/ll-merge-expose-path'Libravatar Junio C Hamano1-1/+4
2015-06-04ll-merge: pass the original path to external driversLibravatar Junio C Hamano1-1/+4
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2014-11-04Documentation: typofixesLibravatar Thomas Ackermann1-2/+2
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2014-01-14gitattributes: document more clearly where macros are allowedLibravatar Michael Haggerty1-3/+6
2013-02-01Documentation: the name of the system is 'Git', not 'git'Libravatar Thomas Ackermann1-36/+36
2012-11-09Merge branch 'nd/attr-match-optim-more'Libravatar Jeff King1-0/+1
2012-10-15attr: more matching optimizations from .gitignoreLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2012-10-10Sync with maintLibravatar Junio C Hamano1-0/+5
2012-10-10attr: a note about the order of .gitattributes lookupLibravatar Nguyen Thai Ngoc Duy1-0/+5
2012-09-25Merge branch 'aj/xfuncname-ada'Libravatar Junio C Hamano1-0/+2
2012-09-16Add userdiff patterns for AdaLibravatar Adrian Johnson1-0/+2
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Libravatar Junio C Hamano1-1/+1
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverLibravatar Junio C Hamano1-1/+1
2012-06-25Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesLibravatar Huynh Khoi Nguyen Nguyen1-0/+2
2012-02-17Add a setting to require a filter to be successfulLibravatar Jehan Bing1-10/+31
2011-11-15Add built-in diff patterns for MATLAB codeLibravatar Gustaf Hendeby1-0/+2
2011-08-17Merge branch 'mh/check-attr-relative'Libravatar Junio C Hamano1-0/+3
2011-08-04doc: Add a link from gitattributes(5) to git-check-attr(1)Libravatar Michael Haggerty1-0/+3
2011-08-03gitattributes: Reword "attribute macro" to "macro attribute"Libravatar Michael Haggerty1-9/+9
2011-08-03gitattributes: Clarify discussion of attribute macrosLibravatar Michael Haggerty1-5/+8
2011-05-24doc: discuss textconv versus external diff driversLibravatar Jeff King1-0/+31