summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sync with 1.6.6.1Junio C Hamano2010-01-203-8/+45
|\
| * Git 1.6.6.1v1.6.6.1Junio C Hamano2010-01-203-8/+16
| * Merge branch 'bg/maint-remote-update-default' into maintJunio C Hamano2010-01-202-6/+18
| |\
| * \ Merge branch 'sb/maint-octopus' into maintJunio C Hamano2010-01-202-9/+57
| |\ \
| * \ \ Merge branch 'bg/maint-add-all-doc' into maintJunio C Hamano2010-01-202-29/+88
| |\ \ \
| * \ \ \ Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-01-205-9/+40
| |\ \ \ \
| | * | | | Git 1.6.5.8v1.6.5.8Junio C Hamano2010-01-204-3/+32
| | * | | | Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5Junio C Hamano2010-01-202-4/+8
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1...Junio C Hamano2010-01-201-4/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint-1.6.5Junio C Hamano2010-01-201-5/+5
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint-1.6.5Junio C Hamano2010-01-201-0/+1
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-188-43/+47
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-188-43/+47
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-188-43/+47
| | | | |\ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4Junio C Hamano2010-01-181-1/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix mis-backport of t7002Junio C Hamano2010-01-181-1/+5
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-191-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | bisect: fix singular/plural grammar nitDavid Ripton2010-01-191-3/+5
* | | | | | | | | | | | | | Makefile: honor NO_CURL when setting REMOTE_CURL_* variablesJohannes Sixt2010-01-191-10/+6
* | | | | | | | | | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-181-1/+16
* | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-183-6/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Update draft release notes to 1.6.6.1Junio C Hamano2010-01-181-1/+16
| * | | | | | | | | | | | | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maintJunio C Hamano2010-01-181-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | fast-import: tag may point to any object typeDmitry Potapov2010-01-141-5/+5
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maintJunio C Hamano2010-01-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | grep: NUL terminate input from a fileJim Meyering2010-01-181-0/+1
* | | | | | | | | | | | | Merge branch 'jc/rerere'Junio C Hamano2010-01-1812-18/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-0412-18/+77
* | | | | | | | | | | | | | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches'Junio C Hamano2010-01-182-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove empty directories when checking out a commit with fewer submodulesPeter Collingbourne2010-01-112-2/+19
* | | | | | | | | | | | | | | Merge branch 'nd/include-termios-for-osol'Junio C Hamano2010-01-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add missing #include to support TIOCGWINSZ on SolarisNguyễn Thái Ngọc Duy2010-01-111-0/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'js/windows'Junio C Hamano2010-01-188-133/+329
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Do not use date.c:tm_to_time_t() from compat/mingw.cJohannes Sixt2010-01-161-17/+19
| * | | | | | | | | | | | | | | MSVC: Windows-native implementation for subset of Pthreads APIAndrzej K. Haczewski2010-01-166-11/+217
| * | | | | | | | | | | | | | | MSVC: Fix an "incompatible pointer types" compiler warningRamsay Jones2010-01-162-25/+19
| * | | | | | | | | | | | | | | Windows: avoid the "dup dance" when spawning a child processJohannes Sixt2010-01-163-49/+50
| * | | | | | | | | | | | | | | Windows: simplify the pipe(2) implementationJohannes Sixt2010-01-161-29/+8
| * | | | | | | | | | | | | | | Windows: boost startup by avoiding a static dependency on shell32.dllJohannes Sixt2010-01-161-2/+14
| * | | | | | | | | | | | | | | Windows: disable PythonErik Faye-Lund2010-01-161-0/+2
* | | | | | | | | | | | | | | | Update draft release notes to 1.7.0Junio C Hamano2010-01-171-1/+38
* | | | | | | | | | | | | | | | Merge branch 'tc/test-locate-httpd'Junio C Hamano2010-01-171-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/lib-http.sh: Restructure finding of default httpd locationTarmigan Casebolt2010-01-061-6/+24
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jh/commit-status'Junio C Hamano2010-01-174-3/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t7502: test commit.status, --status and --no-statusJunio C Hamano2010-01-131-0/+109
| * | | | | | | | | | | | | | | | commit: support commit.status, --status, and --no-statusJames P. Howard, II2010-01-133-3/+25
* | | | | | | | | | | | | | | | | Merge branch 'jn/makefile'Junio C Hamano2010-01-172-34/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Makefile: consolidate .FORCE-* targetsJonathan Nieder2010-01-062-11/+8
| * | | | | | | | | | | | | | | | | Makefile: learn to generate listings for targets requiring special flagsJonathan Nieder2010-01-061-7/+7
| * | | | | | | | | | | | | | | | | Makefile: use target-specific variable to pass flags to ccJonathan Nieder2010-01-061-23/+18