summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
Commit message (Expand)AuthorAgeFilesLines
* docs: rewrite the documentation of the text and eol attributesAlex Henrie2023-05-031-28/+31
* Merge branch 'jc/diff-algo-attribute'Junio C Hamano2023-02-271-0/+31
|\
| * diff: teach diff to read algorithm from diff driverJohn Cai2023-02-211-0/+31
* | Merge branch 'ar/typofix-gitattributes-doc'Junio C Hamano2023-01-051-1/+1
|\ \ | |/ |/|
| * gitattributes.txt: fix typo in "comma separated"Andrei Rybak2022-12-281-1/+1
* | userdiff: add builtin diff driver for kotlin language.Jaydeep P Das2022-03-121-0/+2
* | doc: clarify interaction between 'eol' and text=autobrian m. carlson2022-02-141-5/+6
* | docs: correct documentation about eol attributebrian m. carlson2022-01-121-5/+6
* | docs: document symlink restrictions for dot-filesJeff King2021-05-041-0/+6
* | userdiff: add support for SchemeAtharva Raykar2021-04-081-0/+2
* | archive: expand only a single %(describe) per archiveRené Scharfe2021-03-111-1/+2
|/
* userdiff: support BashVictor Engmark2020-10-221-0/+3
* userdiff: support MarkdownAsh Holland2020-05-021-0/+2
* Merge branch 'ln/userdiff-elixir'Junio C Hamano2019-12-011-0/+2
|\
| * userdiff: add Elixir to supported userdiff languagesŁukasz Niemier2019-11-101-0/+2
* | Documentation: fix a bunch of typos, both old and newElijah Newren2019-11-071-3/+3
|/
* userdiff: add a builtin pattern for dts filesStephen Boyd2019-08-211-0/+2
* Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-1/+2
|\
| * checkout: split part of it to new command 'switch'Nguyễn Thái Ngọc Duy2019-04-021-1/+2
* | Merge branch 'ml/userdiff-rust'Junio C Hamano2019-06-211-0/+2
|\ \
| * | userdiff: add built-in pattern for rustMarc-André Lureau2019-05-171-0/+2
* | | userdiff: fix grammar and style issuesBoxuan Li2019-05-291-1/+1
* | | userdiff: add OctaveBoxuan Li2019-05-191-1/+1
|/ /
* | Merge branch 'ab/doc-misc-typofixes'Junio C Hamano2019-04-161-2/+2
|\ \
| * | doc: fix typos in man pagesAlexander Blesius2019-03-181-2/+2
* | | Merge branch 'ma/asciidoctor-fixes-more'Junio C Hamano2019-04-161-1/+1
|\ \ \ | |_|/ |/| |
| * | Documentation: turn middle-of-line tabs into spacesMartin Ågren2019-03-071-1/+1
| |/
* | Merge branch 'yb/utf-16le-bom-spellfix'Junio C Hamano2019-03-111-1/+1
|\ \ | |/ |/|
| * gitattributes.txt: fix typoYash Bhatambare2019-03-071-1/+1
* | Merge branch 'jk/autocrlf-overrides-eol-doc'Junio C Hamano2019-02-061-1/+3
|\ \ | |/ |/|
| * doc/gitattributes: clarify "autocrlf overrides eol"Jeff King2019-01-291-1/+3
* | Support working-tree-encoding "UTF-16LE-BOM"Torsten Bögershausen2019-01-311-1/+3
|/
* doc: fix inappropriate monospace formattingAndreas Heiduk2018-10-231-15/+15
* Merge branch 'nd/command-list'Junio C Hamano2018-06-011-1/+1
|\
| * help: use command-list.txt for the source of guidesNguyễn Thái Ngọc Duy2018-05-211-1/+1
* | Merge branch 'nd/doc-header'Junio C Hamano2018-05-231-2/+2
|\ \
| * | doc: keep first level section header in upper caseNguyễn Thái Ngọc Duy2018-05-021-2/+2
| |/
* | Merge branch 'ls/checkout-encoding'Junio C Hamano2018-05-081-0/+88
|\ \ | |/ |/|
| * convert: add round trip check based on 'core.checkRoundtripEncoding'Lars Schneider2018-04-161-0/+8
| * convert: add 'working-tree-encoding' attributeLars Schneider2018-04-161-0/+80
* | Merge branch 'jk/attributes-path-doc'Junio C Hamano2018-03-211-3/+10
|\ \
| * | doc/gitattributes: mention non-recursive behaviorjk/attributes-path-docJeff King2018-03-201-3/+10
| |/
* | userdiff: add built-in pattern for golangag/userdiff-go-funcnameAlban Gruin2018-03-011-0/+2
* | Docs: split out long-running subprocess handshakejt/long-running-process-docJonathan Tan2018-01-251-46/+8
|/
* add: introduce "--renormalize"tb/add-renormalizeTorsten Bögershausen2017-11-171-2/+4
* Documentation: mention that `eol` can change the dirty status of pathsbb/doc-eol-dirtyBen Boeckel2017-09-071-1/+4
* Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano2017-07-261-4/+65
|\
| * convert: add "status=delayed" to filter process protocolLars Schneider2017-06-301-4/+65
* | doc: do not use `rm .git/index` when normalizing line endingsah/doc-gitattributes-empty-indexAndreas Heiduk2017-06-151-1/+1
|/
* Merge branch 'tb/doc-eol-normalization'Junio C Hamano2017-04-231-4/+2
|\
View Lorry Controller Status