| Commit message (Expand) | Author | Age |
* | gitattributes: document more clearly where macros are allowed | Michael Haggerty | 2014-01-14 |
* | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 |
* | Merge branch 'nd/attr-match-optim-more' | Jeff King | 2012-11-09 |
|\ |
|
| * | attr: more matching optimizations from .gitignore | Nguyễn Thái Ngọc Duy | 2012-10-15 |
* | | Sync with maint | Junio C Hamano | 2012-10-10 |
|\ \ |
|
| * | | attr: a note about the order of .gitattributes lookup | Nguyen Thai Ngoc Duy | 2012-10-10 |
* | | | Merge branch 'aj/xfuncname-ada' | Junio C Hamano | 2012-09-25 |
|\ \ \ |
|
| * | | | Add userdiff patterns for Ada | Adrian Johnson | 2012-09-16 |
| |/ / |
|
* | | | Merge branch 'jc/ll-merge-binary-ours' | Junio C Hamano | 2012-09-14 |
|\ \ \
| |/ /
|/| | |
|
| * | | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 |
* | | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes | Huynh Khoi Nguyen Nguyen | 2012-06-25 |
| |/
|/| |
|
* | | Add a setting to require a filter to be successful | Jehan Bing | 2012-02-17 |
|/ |
|
* | Add built-in diff patterns for MATLAB code | Gustaf Hendeby | 2011-11-15 |
* | Merge branch 'mh/check-attr-relative' | Junio C Hamano | 2011-08-17 |
|\ |
|
| * | doc: Add a link from gitattributes(5) to git-check-attr(1) | Michael Haggerty | 2011-08-04 |
* | | gitattributes: Reword "attribute macro" to "macro attribute" | Michael Haggerty | 2011-08-03 |
* | | gitattributes: Clarify discussion of attribute macros | Michael Haggerty | 2011-08-03 |
|/ |
|
* | doc: discuss textconv versus external diff drivers | Jeff King | 2011-05-24 |
* | docs: fix grammar in gitattributes.txt | Alexei Sholik | 2011-03-18 |
* | Merge branch 'jn/perl-funcname' | Junio C Hamano | 2011-01-13 |
|\ |
|
| * | diff: funcname and word patterns for perl | Jonathan Nieder | 2010-12-27 |
* | | Merge branch 'jk/diff-driver-binary-doc' | Junio C Hamano | 2011-01-13 |
|\ \ |
|
| * | | docs: explain diff.*.binary option | Jeff King | 2011-01-10 |
* | | | convert filter: supply path to external driver | Pete Wyckoff | 2010-12-22 |
| |/
|/| |
|
* | | Make the tab width used for whitespace checks configurable | Johannes Sixt | 2010-12-01 |
* | | Merge branch 'bc/fortran-userdiff' | Junio C Hamano | 2010-09-29 |
|\ \ |
|
| * | | userdiff.c: add builtin fortran regex patterns | Brandon Casey | 2010-09-10 |
* | | | Merge branch 'po/etc-gitattributes' | Junio C Hamano | 2010-09-29 |
|\ \ \
| |/ /
|/| | |
|
| * | | Add global and system-wide gitattributes | Petr Onderka | 2010-09-01 |
* | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 |
|\ \ \ |
|
| * | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
| |/ / |
|
* | | | Userdiff patterns for C# | Petr Onderka | 2010-08-16 |
|/ / |
|
* | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 |
|\ \ |
|
| * | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 |
| * | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 |
| * | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 |
* | | | Merge branch 'tr/word-diff' | Junio C Hamano | 2010-05-21 |
|\ \ \ |
|
| * | | | diff: add --word-diff option that generalizes --color-words | Thomas Rast | 2010-04-14 |
| | |/
| |/| |
|
* | | | diff: cache textconv output | Jeff King | 2010-04-02 |
|/ / |
|
* | | Documentation: mention conflict marker size argument (%L) for merge driver | Bert Wesarg | 2010-02-23 |
|/ |
|
* | conflict-marker-size: add test and docs | Junio C Hamano | 2010-01-20 |
* | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 |
* | Illustrate "filter" attribute with an example | Nanako Shiraishi | 2009-12-14 |
* | Document `delta` attribute in "git help attributes". | Nasser Grainawi | 2009-10-21 |
* | Change mentions of "git programs" to "git commands" | Ori Avtalion | 2009-08-12 |
* | doc/gitattributes: clarify location of config text | Jeff King | 2009-04-17 |
* | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-07 |
|\ |
|
| * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-07 |
| |\ |
|
| | * | Documentation: clarify .gitattributes search | Jason Merrill | 2009-04-07 |
* | | | gitattributes.txt: Path matching rules are explained in gitignore.txt | Johannes Sixt | 2009-02-25 |