summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* cvsimport: standarize system() calls to external git toolsBen Walton2010-01-191-5/+5
* cvsimport: standarize open() calls to external git toolsBen Walton2010-01-191-4/+4
* cvsimport: modernize callouts to git subcommandsBen Walton2010-01-191-32/+32
* 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
| * | | | | | | | Makefile: regenerate assembler listings when askedJonathan Nieder2010-01-061-2/+2
* | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2010-01-172-1/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-062-1/+58
* | | | | | | | | | Merge branch 'tc/clone-v-progress'Junio C Hamano2010-01-176-7/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | clone: use --progress to force progress reportingTay Ray Chuan2009-12-283-3/+11
| * | | | | | | | | | clone: set transport->verbose when -v/--verbose is usedTay Ray Chuan2009-12-281-1/+3
| * | | | | | | | | | git-clone.txt: reword description of progress behaviourTay Ray Chuan2009-12-281-3/+6
| * | | | | | | | | | check stderr with isatty() instead of stdout when deciding to show progressTay Ray Chuan2009-12-284-4/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tc/smart-http-restrict'Junio C Hamano2010-01-177-260/+362
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Test t5560: Fix test when run with dashTarmigan Casebolt2010-01-151-5/+10
| * | | | | | | | | | Smart-http tests: Test http-backend without curl or a webserverTarmigan Casebolt2010-01-062-6/+25
| * | | | | | | | | | Smart-http tests: Break test t5560-http-backend into piecesTarmigan Casebolt2010-01-063-147/+173
| * | | | | | | | | | Smart-http tests: Improve coverage in test t5560Tarmigan Casebolt2010-01-061-11/+10
| * | | | | | | | | | Smart-http: check if repository is OK to export before serving itTarmigan Casebolt2010-01-064-2/+55
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'jk/run-command-use-shell'Junio C Hamano2010-01-1711-35/+69
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t4030, t4031: work around bogus MSYS bash path conversionJohannes Sixt2010-01-052-2/+2
View Lorry Controller Status