author | Junio C Hamano <gitster@pobox.com> | |
Thu, 25 Nov 2010 00:00:32 +0000 (16:00 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 25 Nov 2010 00:00:32 +0000 (16:00 -0800) | ||
commit | 0da938579825cef757e8c5cccb93920467574da7 | |
tree | fe787e5eb720c11f6a7c83b3b42c93b08445f44d | tree | snapshot |
parent | ef80cf1fcf3c722dc324a67515d81cf30385ab63 | commit | diff |
parent | 50906e04e8f48215b0b09841686709b92a2ab2e4 | commit | diff |
Merge branch 'jj/icase-directory' into next
* jj/icase-directory:
Support case folding in git fast-import when core.ignorecase=true
Support case folding for git add when core.ignorecase=true
Add case insensitivity support when using git ls-files
Add case insensitivity support for directories when using git status
Case insensitivity support for .gitignore via core.ignorecase
Add string comparison functions that respect the ignore_case variable.
Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
Makefile & configure: add a NO_FNMATCH flag
Conflicts:
Makefile
config.mak.in
configure.ac
fast-import.c
* jj/icase-directory:
Support case folding in git fast-import when core.ignorecase=true
Support case folding for git add when core.ignorecase=true
Add case insensitivity support when using git ls-files
Add case insensitivity support for directories when using git status
Case insensitivity support for .gitignore via core.ignorecase
Add string comparison functions that respect the ignore_case variable.
Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
Makefile & configure: add a NO_FNMATCH flag
Conflicts:
Makefile
config.mak.in
configure.ac
fast-import.c
Makefile | diff1 | | diff2 | | blob | history |
config.mak.in | diff1 | | diff2 | | blob | history |
configure.ac | diff1 | | diff2 | | blob | history |
dir.c | diff1 | | diff2 | | blob | history |
fast-import.c | diff1 | | diff2 | | blob | history |
read-cache.c | diff1 | | diff2 | | blob | history |