diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-10 13:47:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 13:47:20 -0800 |
| commit | 2adf7247ec1f82032f52682918c200716145bffd (patch) | |
| tree | 2af5f520d874aa11b668138aebecce58da3256eb /merge-recursive.c | |
| parent | Merge branch 'tb/test-shell-lint' (diff) | |
| parent | wildmatch: replace variable 'special' with better named ones (diff) | |
| download | tgif-2adf7247ec1f82032f52682918c200716145bffd.tar.xz | |
Merge branch 'nd/wildmatch'
Allows pathname patterns in .gitignore and .gitattributes files
with double-asterisks "foo/**/bar" to match any number of directory
hierarchies.
* nd/wildmatch:
wildmatch: replace variable 'special' with better named ones
compat/fnmatch: respect NO_FNMATCH* even on glibc
wildmatch: fix "**" special case
t3070: Disable some failing fnmatch tests
test-wildmatch: avoid Windows path mangling
Support "**" wildcard in .gitignore and .gitattributes
wildmatch: make /**/ match zero or more directories
wildmatch: adjust "**" behavior
wildmatch: fix case-insensitive matching
wildmatch: remove static variable force_lower_case
wildmatch: make wildmatch's return value compatible with fnmatch
t3070: disable unreliable fnmatch tests
Integrate wildmatch to git
wildmatch: follow Git's coding convention
wildmatch: remove unnecessary functions
Import wildmatch from rsync
ctype: support iscntrl, ispunct, isxdigit and isprint
ctype: make sane_ctype[] const array
Conflicts:
Makefile
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions