| Commit message (Expand) | Author | Age | Files | Lines |
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with | Christian Couder | 2013-12-05 | 1 | -1/+1 |
* | Merge branch 'lf/read-blob-data-from-index' | Junio C Hamano | 2013-04-21 | 1 | -34/+1 |
|\ |
|
| * | read_blob_data_from_index(): optionally return the size of blob data | Lukas Fleischer | 2013-04-17 | 1 | -1/+1 |
| * | attr.c: extract read_index_data() as read_blob_data_from_index() | Lukas Fleischer | 2013-04-17 | 1 | -34/+1 |
| * | Merge branch 'jc/directory-attrs-regression-fix' into maint-1.8.1 | Junio C Hamano | 2013-04-07 | 1 | -12/+13 |
| |\ |
|
* | \ | Merge branch 'jc/directory-attrs-regression-fix' | Junio C Hamano | 2013-04-03 | 1 | -12/+13 |
|\ \ \
| | |/
| |/| |
|
| * | | attr.c::path_matches(): special case paths that end with a slash | Junio C Hamano | 2013-03-28 | 1 | -4/+4 |
| * | | attr.c::path_matches(): the basename is part of the pathname | Junio C Hamano | 2013-03-26 | 1 | -9/+10 |
* | | | Sync with 1.8.1.5 | Junio C Hamano | 2013-03-01 | 1 | -3/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Make !pattern in .gitattributes non-fatal | Thomas Rast | 2013-03-01 | 1 | -3/+5 |
| * | | Merge branch 'nd/fix-directory-attrs-off-by-one' into maint | Junio C Hamano | 2013-01-29 | 1 | -20/+18 |
| |\ \
| | |/ |
|
| * | | Merge branch 'nd/attr-debug-fix' into maint | Junio C Hamano | 2013-01-28 | 1 | -1/+1 |
| |\ \ |
|
* | \ \ | Merge branch 'nd/fix-directory-attrs-off-by-one' | Junio C Hamano | 2013-01-22 | 1 | -20/+18 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | attr: avoid calling find_basename() twice per path | Duy Nguyen | 2013-01-16 | 1 | -27/+18 |
| * | | | attr: fix off-by-one directory component length calculation | Nguyễn Thái Ngọc Duy | 2013-01-15 | 1 | -0/+7 |
| |/ / |
|
* | | | Merge branch 'nd/attr-debug-fix' | Junio C Hamano | 2013-01-18 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | attr: make it build with DEBUG_ATTR again | Nguyễn Thái Ngọc Duy | 2013-01-15 | 1 | -1/+1 |
* | | | Merge branch 'as/dir-c-cleanup' | Junio C Hamano | 2013-01-10 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | dir.c: rename excluded() to is_excluded() | Adam Spiers | 2012-12-28 | 1 | -1/+1 |
| |/ |
|
* | | Add directory pattern matching to attributes | Jean-Noël AVILA | 2012-12-17 | 1 | -8/+17 |
* | | Merge branch 'nd/attr-match-optim-more' | Jeff King | 2012-11-09 | 1 | -21/+31 |
|\ \
| |/ |
|
| * | attr: more matching optimizations from .gitignore | Nguyễn Thái Ngọc Duy | 2012-10-15 | 1 | -21/+31 |
* | | Merge branch 'nd/attr-match-optim' | Jeff King | 2012-10-25 | 1 | -8/+13 |
|\ \
| |/ |
|
| * | attr: avoid searching for basename on every match | Nguyễn Thái Ngọc Duy | 2012-10-05 | 1 | -6/+9 |
| * | attr: avoid strlen() on every match | Nguyễn Thái Ngọc Duy | 2012-10-05 | 1 | -2/+4 |
* | | Merge branch 'jk/config-warn-on-inaccessible-paths' | Junio C Hamano | 2012-09-17 | 1 | -1/+1 |
|\ \ |
|
| * | | attr: failure to open a .gitattributes file is OK with ENOTDIR | Junio C Hamano | 2012-09-13 | 1 | -1/+1 |
* | | | 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 |
| |/ |
|
* | | warn_on_inaccessible(): a helper to warn on inaccessible paths | Junio C Hamano | 2012-08-21 | 1 | -1/+1 |
* | | attr: warn on inaccessible attribute files | Jeff King | 2012-08-21 | 1 | -1/+4 |
* | | attr: make sure we have an xdg path before using it | Jeff King | 2012-07-24 | 1 | -5/+7 |
* | | Let core.attributesfile default to $XDG_CONFIG_HOME/git/attributes | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -7/+10 |
|/ |
|
* | Merge branch 'maint-1.7.6' into maint-1.7.7 | Junio C Hamano | 2012-01-11 | 1 | -0/+1 |
|\ |
|
| * | attr: fix leak in free_attr_elem | Jeff King | 2012-01-11 | 1 | -0/+1 |
* | | Merge the attributes fix in from maint-1.6.6 branch | Junio C Hamano | 2012-01-10 | 1 | -32/+43 |
|\ \
| |/ |
|
| * | attr.c: clarify the logic to pop attr_stack | Junio C Hamano | 2012-01-10 | 1 | -1/+10 |
| * | attr.c: make bootstrap_attr_stack() leave early | Junio C Hamano | 2012-01-10 | 1 | -30/+31 |
| * | attr: drop misguided defensive coding | Jeff King | 2012-01-10 | 1 | -1/+1 |
| * | attr: don't confuse prefixes with leading directories | Jeff King | 2012-01-10 | 1 | -1/+2 |
* | | attr.c: respect core.ignorecase when matching attribute patterns | Brandon Casey | 2011-10-11 | 1 | -2/+3 |
* | | attr: read core.attributesfile from git_default_core_config | Junio C Hamano | 2011-10-06 | 1 | -13/+2 |
* | | cleanup: use internal memory allocation wrapper functions everywhere | Brandon Casey | 2011-10-06 | 1 | -1/+1 |
* | | attr.c: avoid inappropriate access to strbuf "buf" member | Brandon Casey | 2011-10-06 | 1 | -13/+11 |
* | | Merge branch 'mh/attr' | Junio C Hamano | 2011-08-28 | 1 | -50/+63 |
|\ \ |
|
| * | | Unroll the loop over passes | Michael Haggerty | 2011-08-14 | 1 | -25/+26 |
| * | | Change while loop into for loop | Michael Haggerty | 2011-08-14 | 1 | -4/+1 |
| * | | Determine the start of the states outside of the pass loop | Michael Haggerty | 2011-08-14 | 1 | -3/+5 |
| * | | Change parse_attr() to take a pointer to struct attr_state | Michael Haggerty | 2011-08-14 | 1 | -6/+11 |
| * | | Increment num_attr in parse_attr_line(), not parse_attr() | Michael Haggerty | 2011-08-14 | 1 | -4/+4 |