| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | gitattributes: Document the unified "auto" handling | Torsten Bögershausen | 2016-08-26 | 1 | -34/+24 |
| * | Spelling fixesvs/typofix | Ville Skyttä | 2016-08-11 | 1 | -1/+1 |
| * | Merge branch 'jh/clean-smudge-f-doc' | Junio C Hamano | 2016-08-08 | 1 | -0/+5 |
| |\ |
|
| | * | clarify %f documentationjh/clean-smudge-f-doc | Joey Hess | 2016-08-03 | 1 | -0/+5 |
| * | | Merge branch 'jc/renormalize-merge-kill-safer-crlf' | Junio C Hamano | 2016-07-25 | 1 | -6/+9 |
| |\ \ |
|
| | * | | convert: unify the "auto" handling of CRLF | Torsten Bögershausen | 2016-07-06 | 1 | -6/+9 |
| | |/ |
|
| * | | userdiff: add built-in pattern for CSSwd/userdiff-css | William Duclot | 2016-06-03 | 1 | -0/+2 |
| |/ |
|
| * | userdiff: add support for Fountain documentszb/userdiff-fountain | Zoë Blade | 2015-07-23 | 1 | -0/+2 |
| * | Merge branch 'jc/ll-merge-expose-path' | Junio C Hamano | 2015-06-24 | 1 | -1/+4 |
| |\ |
|
| | * | ll-merge: pass the original path to external driversjc/ll-merge-expose-path | Junio C Hamano | 2015-06-04 | 1 | -1/+4 |
| * | | *config.txt: stick to camelCase naming conventionnd/config-doc-camelCase | Nguyễn Thái Ngọc Duy | 2015-03-13 | 1 | -1/+1 |
| |/ |
|
| * | Documentation: typofixes | Thomas Ackermann | 2014-11-04 | 1 | -2/+2 |
| * | diff --stat: mark any file larger than core.bigfilethreshold binary | Nguyễn Thái Ngọc Duy | 2014-08-18 | 1 | -2/+2 |
| * | gitattributes: document more clearly where macros are allowedmh/attr-macro-doc | Michael Haggerty | 2014-01-14 | 1 | -3/+6 |
| * | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 1 | -36/+36 |
| * | Merge branch 'nd/attr-match-optim-more' | Jeff King | 2012-11-09 | 1 | -0/+1 |
| |\ |
|
| | * | attr: more matching optimizations from .gitignore | Nguyễn Thái Ngọc Duy | 2012-10-15 | 1 | -0/+1 |
| * | | Sync with maint | Junio C Hamano | 2012-10-10 | 1 | -0/+5 |
| |\ \ |
|
| | * | | attr: a note about the order of .gitattributes lookup | Nguyen Thai Ngoc Duy | 2012-10-10 | 1 | -0/+5 |
| * | | | Merge branch 'aj/xfuncname-ada' | Junio C Hamano | 2012-09-25 | 1 | -0/+2 |
| |\ \ \ |
|
| | * | | | Add userdiff patterns for Ada | Adrian Johnson | 2012-09-16 | 1 | -0/+2 |
| | |/ / |
|
| * | | | Merge branch 'jc/ll-merge-binary-ours' | Junio C Hamano | 2012-09-14 | 1 | -1/+1 |
| |\ \ \
| |/ /
|/| | |
|
| | * | | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+1 |
| * | | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -0/+2 |
| | |/
|/| |
|
| * | | Add a setting to require a filter to be successfuljb/required-filter | Jehan Bing | 2012-02-17 | 1 | -10/+31 |
| |/ |
|
| * | Add built-in diff patterns for MATLAB codegh/userdiff-matlab | Gustaf Hendeby | 2011-11-15 | 1 | -0/+2 |
| * | Merge branch 'mh/check-attr-relative' | Junio C Hamano | 2011-08-17 | 1 | -0/+3 |
| |\ |
|
| | * | doc: Add a link from gitattributes(5) to git-check-attr(1) | Michael Haggerty | 2011-08-04 | 1 | -0/+3 |
| * | | gitattributes: Reword "attribute macro" to "macro attribute" | Michael Haggerty | 2011-08-03 | 1 | -9/+9 |
| * | | gitattributes: Clarify discussion of attribute macros | Michael Haggerty | 2011-08-03 | 1 | -5/+8 |
| |/ |
|
| * | doc: discuss textconv versus external diff drivers | Jeff King | 2011-05-24 | 1 | -0/+31 |
| * | docs: fix grammar in gitattributes.txt | Alexei Sholik | 2011-03-18 | 1 | -5/+5 |
| * | Merge branch 'jn/perl-funcname' | Junio C Hamano | 2011-01-13 | 1 | -0/+2 |
| |\ |
|
| | * | diff: funcname and word patterns for perl | Jonathan Nieder | 2010-12-27 | 1 | -0/+2 |
| * | | Merge branch 'jk/diff-driver-binary-doc' | Junio C Hamano | 2011-01-13 | 1 | -0/+33 |
| |\ \ |
|
| | * | | docs: explain diff.*.binary option | Jeff King | 2011-01-10 | 1 | -0/+33 |
| * | | | convert filter: supply path to external driver | Pete Wyckoff | 2010-12-22 | 1 | -0/+10 |
| | |/
|/| |
|
| * | | Make the tab width used for whitespace checks configurable | Johannes Sixt | 2010-12-01 | 1 | -2/+4 |
| * | | Merge branch 'bc/fortran-userdiff' | Junio C Hamano | 2010-09-29 | 1 | -0/+2 |
| |\ \ |
|
| | * | | userdiff.c: add builtin fortran regex patterns | Brandon Casey | 2010-09-10 | 1 | -0/+2 |
| * | | | Merge branch 'po/etc-gitattributes' | Junio C Hamano | 2010-09-29 | 1 | -3/+10 |
| |\ \ \
| |/ /
|/| | |
|
| | * | | Add global and system-wide gitattributes | Petr Onderka | 2010-09-01 | 1 | -3/+10 |
| * | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+34 |
| |\ \ \ |
|
| | * | | | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 | 1 | -0/+34 |
| | |/ / |
|
| * | | | Userdiff patterns for C# | Petr Onderka | 2010-08-16 | 1 | -0/+2 |
| |/ / |
|
| * | | Merge branch 'eb/core-eol' | Junio C Hamano | 2010-06-21 | 1 | -32/+133 |
| |\ \ |
|
| | * | | Add "core.eol" config variable | Eyvind Bernhardsen | 2010-06-06 | 1 | -13/+15 |
| | * | | Rename the "crlf" attribute "text" | Eyvind Bernhardsen | 2010-05-19 | 1 | -24/+35 |
| | * | | Add per-repository eol normalization | Eyvind Bernhardsen | 2010-05-19 | 1 | -25/+113 |
| * | | | Merge branch 'tr/word-diff' | Junio C Hamano | 2010-05-21 | 1 | -1/+1 |
| |\ \ \ |
|
