summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jj/icase-directory'Junio C Hamano2010-12-038-27/+242
|\
| * Support case folding in git fast-import when core.ignorecase=trueJoshua Jensen2010-10-061-3/+4
| * Support case folding for git add when core.ignorecase=trueJoshua Jensen2010-10-061-0/+23
| * Add case insensitivity support when using git ls-filesJoshua Jensen2010-10-061-12/+26
| * Add case insensitivity support for directories when using git statusJoshua Jensen2010-10-062-2/+110
| * Case insensitivity support for .gitignore via core.ignorecaseJoshua Jensen2010-10-061-6/+6
| * Add string comparison functions that respect the ignore_case variable.Joshua Jensen2010-10-062-0/+20
| * Makefile & configure: add a NO_FNMATCH_CASEFOLD flagÆvar Arnfjörð Bjarmason2010-10-063-0/+33
| * Makefile & configure: add a NO_FNMATCH flagÆvar Arnfjörð Bjarmason2010-10-063-5/+20
* | Merge branch 'maint' to sync with Git 1.7.3.3Junio C Hamano2010-12-033-4/+16
|\ \
| * | Git 1.7.3.3v1.7.3.3Junio C Hamano2010-12-032-3/+11
| * | CodingGuidelines: mention whitespace preferences for shell scriptsGiuseppe Bilotta2010-12-031-0/+4
| * | Documentation: do not misinterpret pull refspec as bold textJonathan Nieder2010-12-031-2/+2
* | | Update draft release notes to 1.7.4Junio C Hamano2010-12-021-10/+37
* | | Merge branch 'maint'Junio C Hamano2010-12-026-2/+78
|\ \ \ | |/ /
| * | Prepare for 1.7.3.3Junio C Hamano2010-12-025-1/+77
| |\ \
| | * \ Git 1.7.2.4v1.7.2.4Junio C Hamano2010-12-025-2/+32
| | |\ \
| | | * \ Git 1.7.1.3v1.7.1.3Junio C Hamano2010-12-024-2/+22
| | | |\ \
| | | | * | Git 1.7.0.8v1.7.0.8Junio C Hamano2010-12-023-2/+12
| * | | | | Documentation: Fix mark-up of lines with more than one tildeJunio C Hamano2010-12-022-2/+2
| * | | | | Merge branch 'cb/maint-orphan-merge-noclobber' into maintJunio C Hamano2010-12-022-1/+35
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/add-e-doc' into maintJunio C Hamano2010-12-021-3/+77
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'bg/maint-gitweb-test-lib' into maintJunio C Hamano2010-12-021-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/maint-merge-file-subdir' into maintJunio C Hamano2010-12-023-3/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ks/no-textconv-symlink' into maintJunio C Hamano2010-12-026-25/+114
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'bc/fortran-userdiff' into maintJunio C Hamano2010-12-023-1/+20
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'maint'Junio C Hamano2010-12-014-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-1.7.2' into maintJunio C Hamano2010-12-014-5/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge branch 'maint-1.7.1' into maint-1.7.2Junio C Hamano2010-12-012-2/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'maint-1.7.0' into maint-1.7.1Junio C Hamano2010-12-012-2/+7
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | add: introduce add.ignoreerrors synonym for add.ignore-errorsJonathan Nieder2010-12-012-2/+7
| | * | | | | | | | | | bash: Match lightweight tags in promptknittl2010-12-011-1/+1
| | * | | | | | | | | | git-commit.txt: (synopsis): move -i and -o before "--"Jari Aalto2010-12-011-2/+2
* | | | | | | | | | | | commit.c: Remove backward goto in read_craft_line()Ralf Thielow2010-12-011-6/+7
* | | | | | | | | | | | Merge branch 'cb/leading-path-removal'Junio C Hamano2010-11-296-135/+215
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | use persistent memory for rejected pathsClemens Buchacher2010-11-154-42/+38
| * | | | | | | | | | | | do not overwrite files in leading pathClemens Buchacher2010-10-134-10/+31
| * | | | | | | | | | | | lstat_cache: optionally return match_lenClemens Buchacher2010-10-131-16/+27
| * | | | | | | | | | | | add function check_ok_to_remove()Clemens Buchacher2010-10-131-49/+58
| * | | | | | | | | | | | t7607: add leading-path testsClemens Buchacher2010-10-131-0/+51
| * | | | | | | | | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-10-131-23/+15
* | | | | | | | | | | | | Merge branch 'en/merge-recursive'Junio C Hamano2010-11-297-240/+1172
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | t6022: Use -eq not = to test output of wc -lBrian Gernhardt2010-11-171-32/+32
| * | | | | | | | | | | | | merge-recursive:make_room_for_directories - work around dumb compilersJunio C Hamano2010-10-211-1/+1
| * | | | | | | | | | | | | merge-recursive: Remove redundant path clearing for D/F conflictsElijah Newren2010-09-291-15/+2
| * | | | | | | | | | | | | merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-292-1/+59
| * | | | | | | | | | | | | handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-292-10/+17
| * | | | | | | | | | | | | merge_content(): Check whether D/F conflicts are still presentElijah Newren2010-09-292-6/+24
| * | | | | | | | | | | | | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflictsElijah Newren2010-09-292-5/+4
| * | | | | | | | | | | | | conflict_rename_delete(): Check whether D/F conflicts are still presentElijah Newren2010-09-292-2/+10
View Lorry Controller Status