diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:10:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:10:34 -0800 |
| commit | 5e738ae820ec53c45895b029baa3a1f63e654b1b (patch) | |
| tree | 80624092ee1bf2ae435fc220e6f529f096e2a039 /git-merge-one-file.sh | |
| parent | Merge branch 'maint' to sync with Git 1.7.3.3 (diff) | |
| parent | Support case folding in git fast-import when core.ignorecase=true (diff) | |
| download | tgif-5e738ae820ec53c45895b029baa3a1f63e654b1b.tar.xz | |
Merge branch 'jj/icase-directory'
* 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
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions