| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'ss/exc-flag-is-a-collection-of-bits' | Junio C Hamano | 2016-04-06 | 1 | -1/+1 |
|\ |
|
| * | dir: store EXC_FLAG_* values in unsigned integersss/exc-flag-is-a-collection-of-bits | Saurav Sachidanand | 2016-03-01 | 1 | -1/+1 |
| * | Merge branch 'pt/xdg-config-path' into maint | Junio C Hamano | 2015-06-05 | 1 | -5/+2 |
| |\ |
|
| * \ | Merge branch 'cn/bom-in-gitignore' into maint | Junio C Hamano | 2015-05-13 | 1 | -2/+7 |
| |\ \ |
|
* | | | | convert trivial cases to FLEX_ARRAY macros | Jeff King | 2016-02-22 | 1 | -3/+1 |
* | | | | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 | 1 | -1/+1 |
* | | | | memoize common git-path "constant" filesjk/git-path | Jeff King | 2015-08-10 | 1 | -1/+3 |
* | | | | Merge branch 'pt/xdg-config-path' | Junio C Hamano | 2015-05-11 | 1 | -5/+2 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | attr.c: replace home_config_paths() with xdg_config_home() | Paul Tan | 2015-05-06 | 1 | -5/+2 |
* | | | | Merge branch 'cn/bom-in-gitignore' | Junio C Hamano | 2015-05-05 | 1 | -2/+7 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | attr: skip UTF8 BOM at the beginning of the input filecn/bom-in-gitignore | Junio C Hamano | 2015-04-16 | 1 | -2/+7 |
| |/ |
|
* | | attr: avoid heavy work when we know the specified attr is not definednd/attr-optim | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -5/+28 |
* | | attr: do not attempt to expand when we know it's not a macro | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -3/+7 |
* | | attr.c: rename arg name attr_nr to avoid shadowing the global one | Nguyễn Thái Ngọc Duy | 2014-12-29 | 1 | -3/+3 |
|/ |
|
* | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-array | René Scharfe | 2014-09-18 | 1 | -2/+1 |
* | attr.c: use ALLOC_GROW() in handle_attr_line() | Dmitry S. Dolzhenko | 2014-03-03 | 1 | -6/+1 |
* | 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 |
|\ |
|