aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt
AgeCommit message (Expand)AuthorFilesLines
2024-01-24merge-ll: expose revision names to custom driversAntonin Delpeuch1-4/+5
2023-12-28attr: add builtin objectmode values supportJoanna Wang1-0/+15
2023-10-05doc: fix some typos, grammar and wording issuesŠtěpán Němec1-2/+2
2023-06-23ll-merge: killing the external merge driver aborts the mergeJunio C Hamano1-1/+4
2023-05-03docs: rewrite the documentation of the text and eol attributesAlex Henrie1-28/+31
2023-02-27Merge branch 'jc/diff-algo-attribute'Junio C Hamano1-0/+31
2023-02-21diff: teach diff to read algorithm from diff driverJohn Cai1-0/+31
2023-01-05Merge branch 'ar/typofix-gitattributes-doc'Junio C Hamano1-1/+1
2022-12-28gitattributes.txt: fix typo in "comma separated"Andrei Rybak1-1/+1
2022-03-12userdiff: add builtin diff driver for kotlin language.Jaydeep P Das1-0/+2
2022-02-14doc: clarify interaction between 'eol' and text=autobrian m. carlson1-5/+6
2022-01-12docs: correct documentation about eol attributebrian m. carlson1-5/+6
2021-05-04docs: document symlink restrictions for dot-filesJeff King1-0/+6
2021-04-08userdiff: add support for SchemeAtharva Raykar1-0/+2
2021-03-11archive: expand only a single %(describe) per archiveRené Scharfe1-1/+2
2020-10-22userdiff: support BashVictor Engmark1-0/+3
2020-05-02userdiff: support MarkdownAsh Holland1-0/+2
2019-12-01Merge branch 'ln/userdiff-elixir'Junio C Hamano1-0/+2
2019-11-10userdiff: add Elixir to supported userdiff languagesŁukasz Niemier1-0/+2
2019-11-07Documentation: fix a bunch of typos, both old and newElijah Newren1-3/+3
2019-08-21userdiff: add a builtin pattern for dts filesStephen Boyd1-0/+2
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-1/+2
2019-06-21Merge branch 'ml/userdiff-rust'Junio C Hamano1-0/+2
2019-05-29userdiff: fix grammar and style issuesBoxuan Li1-1/+1
2019-05-19userdiff: add OctaveBoxuan Li1-1/+1
2019-05-17userdiff: add built-in pattern for rustMarc-André Lureau1-0/+2
2019-04-16Merge branch 'ab/doc-misc-typofixes'Junio C Hamano1-2/+2
2019-04-16Merge branch 'ma/asciidoctor-fixes-more'Junio C Hamano1-1/+1
2019-04-02checkout: split part of it to new command 'switch'Nguyễn Thái Ngọc Duy1-1/+2
2019-03-18doc: fix typos in man pagesAlexander Blesius1-2/+2
2019-03-11Merge branch 'yb/utf-16le-bom-spellfix'Junio C Hamano1-1/+1
2019-03-07Documentation: turn middle-of-line tabs into spacesMartin Ågren1-1/+1
2019-03-07gitattributes.txt: fix typoYash Bhatambare1-1/+1
2019-02-06Merge branch 'jk/autocrlf-overrides-eol-doc'Junio C Hamano1-1/+3
2019-01-31Support working-tree-encoding "UTF-16LE-BOM"Torsten Bögershausen1-1/+3
2019-01-29doc/gitattributes: clarify "autocrlf overrides eol"Jeff King1-1/+3
2018-10-23doc: fix inappropriate monospace formattingAndreas Heiduk1-15/+15
2018-06-01Merge branch 'nd/command-list'Junio C Hamano1-1/+1
2018-05-23Merge branch 'nd/doc-header'Junio C Hamano1-2/+2
2018-05-21help: use command-list.txt for the source of guidesNguyễn Thái Ngọc Duy1-1/+1
2018-05-08Merge branch 'ls/checkout-encoding'Junio C Hamano1-0/+88
2018-05-02doc: keep first level section header in upper caseNguyễn Thái Ngọc Duy1-2/+2
2018-04-16convert: add round trip check based on 'core.checkRoundtripEncoding'Lars Schneider1-0/+8
2018-04-16convert: add 'working-tree-encoding' attributeLars Schneider1-0/+80
2018-03-21Merge branch 'jk/attributes-path-doc'Junio C Hamano1-3/+10
2018-03-20doc/gitattributes: mention non-recursive behaviorJeff King1-3/+10
2018-03-01userdiff: add built-in pattern for golangAlban Gruin1-0/+2
2018-01-25Docs: split out long-running subprocess handshakeJonathan Tan1-46/+8
2017-11-17add: introduce "--renormalize"Torsten Bögershausen1-2/+4
2017-09-07Documentation: mention that `eol` can change the dirty status of pathsBen Boeckel1-1/+4
2017-07-26Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshakeJunio C Hamano1-4/+65
2017-06-30convert: add "status=delayed" to filter process protocolLars Schneider1-4/+65
2017-06-15doc: do not use `rm .git/index` when normalizing line endingsAndreas Heiduk1-1/+1
2017-04-23Merge branch 'tb/doc-eol-normalization'Junio C Hamano1-4/+2
2017-04-13gitattributes.txt: document how to normalize the line endingsTorsten Bögershausen1-4/+2
2017-02-01Documentation: fix a typoStefan Beller1-1/+1
2017-02-01attr: support quoting pathname patterns in C styleNguyễn Thái Ngọc Duy1-3/+5
2016-12-06docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider1-1/+3
2016-10-17contrib/long-running-filter: add long running filter exampleLars Schneider1-1/+3
2016-10-17convert: add filter.<driver>.process optionLars Schneider1-1/+154
2016-08-26gitattributes: Document the unified "auto" handlingTorsten Bögershausen1-34/+24
2016-08-11Spelling fixesVille Skyttä1-1/+1
2016-08-08Merge branch 'jh/clean-smudge-f-doc'Junio C Hamano1-0/+5
2016-08-03clarify %f documentationJoey Hess1-0/+5
2016-07-25Merge branch 'jc/renormalize-merge-kill-safer-crlf'Junio C Hamano1-6/+9
2016-07-06convert: unify the "auto" handling of CRLFTorsten Bögershausen1-6/+9
2016-06-03userdiff: add built-in pattern for CSSWilliam Duclot1-0/+2
2015-07-23userdiff: add support for Fountain documentsZoë Blade1-0/+2
2015-06-24Merge branch 'jc/ll-merge-expose-path'Junio C Hamano1-1/+4
2015-06-04ll-merge: pass the original path to external driversJunio C Hamano1-1/+4
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy1-1/+1
2014-11-04Documentation: typofixesThomas Ackermann1-2/+2
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy1-2/+2
2014-01-14gitattributes: document more clearly where macros are allowedMichael Haggerty1-3/+6
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-36/+36
2012-11-09Merge branch 'nd/attr-match-optim-more'Jeff King1-0/+1
2012-10-15attr: more matching optimizations from .gitignoreNguyễn Thái Ngọc Duy1-0/+1
2012-10-10Sync with maintJunio C Hamano1-0/+5
2012-10-10attr: a note about the order of .gitattributes lookupNguyen Thai Ngoc Duy1-0/+5
2012-09-25Merge branch 'aj/xfuncname-ada'Junio C Hamano1-0/+2
2012-09-16Add userdiff patterns for AdaAdrian Johnson1-0/+2
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano1-1/+1
2012-09-08attr: "binary" attribute should choose built-in "binary" merge driverJunio C Hamano1-1/+1
2012-06-25Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributesHuynh Khoi Nguyen Nguyen1-0/+2
2012-02-17Add a setting to require a filter to be successfulJehan Bing1-10/+31
2011-11-15Add built-in diff patterns for MATLAB codeGustaf Hendeby1-0/+2
2011-08-17Merge branch 'mh/check-attr-relative'Junio C Hamano1-0/+3
2011-08-04doc: Add a link from gitattributes(5) to git-check-attr(1)Michael Haggerty1-0/+3
2011-08-03gitattributes: Reword "attribute macro" to "macro attribute"Michael Haggerty1-9/+9
2011-08-03gitattributes: Clarify discussion of attribute macrosMichael Haggerty1-5/+8
2011-05-24doc: discuss textconv versus external diff driversJeff King1-0/+31
2011-03-18docs: fix grammar in gitattributes.txtAlexei Sholik1-5/+5
2011-01-13Merge branch 'jn/perl-funcname'Junio C Hamano1-0/+2
2011-01-13Merge branch 'jk/diff-driver-binary-doc'Junio C Hamano1-0/+33
2011-01-10docs: explain diff.*.binary optionJeff King1-0/+33
2010-12-27diff: funcname and word patterns for perlJonathan Nieder1-0/+2
2010-12-22convert filter: supply path to external driverPete Wyckoff1-0/+10
2010-12-01Make the tab width used for whitespace checks configurableJohannes Sixt1-2/+4
2010-09-29Merge branch 'bc/fortran-userdiff'Junio C Hamano1-0/+2
2010-09-29Merge branch 'po/etc-gitattributes'Junio C Hamano1-3/+10
2010-09-10userdiff.c: add builtin fortran regex patternsBrandon Casey1-0/+2
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-0/+34
2010-09-01Add global and system-wide gitattributesPetr Onderka1-3/+10
2010-08-16Userdiff patterns for C#Petr Onderka1-0/+2
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen1-0/+34
2010-06-21Merge branch 'eb/core-eol'Junio C Hamano1-32/+133
2010-06-06Add "core.eol" config variableEyvind Bernhardsen1-13/+15
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano1-1/+1
2010-05-19Rename the "crlf" attribute "text"Eyvind Bernhardsen1-24/+35
2010-05-19Add per-repository eol normalizationEyvind Bernhardsen1-25/+113
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast1-1/+1
2010-04-02diff: cache textconv outputJeff King1-0/+20
2010-02-23Documentation: mention conflict marker size argument (%L) for merge driverBert Wesarg1-1/+2
2010-01-20conflict-marker-size: add test and docsJunio C Hamano1-0/+17
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-6/+6
2009-12-14Illustrate "filter" attribute with an exampleNanako Shiraishi1-0/+19
2009-10-21Document `delta` attribute in "git help attributes".Nasser Grainawi1-0/+10
2009-08-12Change mentions of "git programs" to "git commands"Ori Avtalion1-1/+1
2009-04-17doc/gitattributes: clarify location of config textJeff King1-3/+6
2009-04-07Merge branch 'maint-1.6.1' into maintJunio C Hamano1-3/+3
2009-04-07Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-3/+3
2009-04-07Documentation: clarify .gitattributes searchJason Merrill1-3/+3
2009-02-25gitattributes.txt: Path matching rules are explained in gitignore.txtJohannes Sixt1-6/+7
2009-01-21Change the spelling of "wordregex".Boyd Stephen Smith Jr1-2/+2
2009-01-17color-words: make regex configurable via attributesThomas Rast1-0/+21
2008-11-14Documentation: New GUI configuration and command-line options.Alexander Gavrilov1-0/+17
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano1-13/+53
2008-11-02Merge branch 'maint'Junio C Hamano1-0/+6
2008-11-01Documentation/gitattributes: Add subsection header for each attributeJakub Narebski1-0/+6
2008-10-31Merge branch 'maint'Junio C Hamano1-2/+2
2008-10-31Documentation: clarify information about 'ident' attributeJan Krüger1-2/+2
2008-10-26document the diff driver textconv featureJeff King1-13/+53
2008-10-06Teach git diff about Objective-C syntaxJonathan del Strother1-0/+2
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixShawn O. Pearce1-9/+9
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce1-2/+2
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-3/+3
2008-09-18diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey1-2/+2
2008-09-18Clarified gitattributes documentation regarding custom hunk header.Garry Dolley1-9/+9
2008-09-12Fix some manual typos.Ralf Wildenhues1-1/+1
2008-09-07Teach "git diff -p" to locate PHP class methodsAndreas Ericsson1-2/+4
2008-08-31Merge branch 'maint'Junio C Hamano1-1/+1
2008-08-31Document clarification: gitmodules, gitattributesGustaf Hendeby1-1/+1
2008-08-30Merge branch 'maint'Junio C Hamano1-3/+37
2008-08-30gitattributes: -crlf is not binaryJunio C Hamano1-3/+37
2008-08-20Teach "git diff -p" HTML funcname patternsJohan Herland1-0/+2
2008-08-20Teach "git diff -p" Python funcname patternsKirill Smelkov1-0/+2
2008-08-12Teach git diff about BibTeX head hunk patternsGustaf Hendeby1-0/+2
2008-08-12gitattributes: Document built in hunk header patternsGustaf Hendeby1-3/+10
2008-07-05Merge branch 'qq/maint'Junio C Hamano1-22/+23
2008-07-05attribute documentation: keep EXAMPLE at endJunio C Hamano1-16/+17
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder1-3/+3
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-8/+8
2008-07-01Documentation formatting and cleanupJonathan Nieder1-6/+6
2008-07-01Documentation: be consistent about "git-" versus "git "Jonathan Nieder1-7/+7
2008-06-09Teach new attribute 'export-ignore' to git-archiveRené Scharfe1-0/+6
2008-06-06documentation: move git(7) to git(1)Christian Couder1-2/+2
2008-03-27Merge branch 'maint'Junio C Hamano1-0/+7
2008-03-27Documentation: clarify use of .git{ignore,attributes} versus .git/info/*Jeff King1-0/+7
2008-02-06safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska1-0/+20
2008-01-06Documentation: rename gitlink macro to linkgitDan McGee1-5/+5
2007-12-22Documentation: describe 'union' low-level merge driverJunio C Hamano1-3/+34
2007-12-09Merge branch 'jc/spht'Junio C Hamano1-0/+31
2007-12-06Use gitattributes to define per-path whitespace ruleJunio C Hamano1-0/+31
2007-11-14Merge branch 'maint'Junio C Hamano1-8/+9
2007-11-14Grammar fixes for gitattributes documentationWincent Colaiuta1-8/+9
2007-09-29Sync with GIT 1.5.3.3Junio C Hamano1-16/+4
2007-09-25gitattributes.txt: Be more to the point in the filter driver description.Johannes Sixt1-5/+4
2007-09-25gitattributes.txt: Remove a duplicated paragraph about 'ident' and 'crlf' int...Johannes Sixt1-11/+0
2007-09-06archive: rename attribute specfile to export-substRené Scharfe1-3/+3
2007-09-06archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLD...René Scharfe1-1/+4
2007-09-03archive: specfile support (--pretty=format: in archive files)René Scharfe1-0/+14
2007-08-24Documentation: Correct various misspellings and typos.Brian Hetro1-3/+3
2007-07-30Documentation/gitattributes.txt: typofixDavid Soria Parra1-1/+1
2007-07-08Document custom hunk header selectionJunio C Hamano1-4/+51
2007-05-14Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent ...Andy Parkins1-3/+3
2007-04-24Add 'filter' attribute and external filter driver definition.Junio C Hamano1-0/+39
2007-04-24Add 'ident' conversion.Junio C Hamano1-2/+29
2007-04-24gitattributes documentation: clarify overridingJunio C Hamano1-3/+5
2007-04-23Document "diff=driver" attributeJunio C Hamano1-3/+29
2007-04-22Documentation/Makefile: fix section (5) installationJunio C Hamano1-1/+1
2007-04-19Document gitattributes(5)Junio C Hamano1-0/+285
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-06 14:29:29 +0000