summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-03-291-3/+3
|\
| * HOME must be set before calling git-init when creating test repositoriesAlex Riesen2011-03-291-3/+3
* | Merge branch 'jc/fetch-progressive-stride'Junio C Hamano2011-03-291-4/+5
|\ \
| * | Fix potential local deadlock during fetch-packJunio C Hamano2011-03-291-4/+5
| | |
| \ \
*-. \ \ Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-sto...Junio C Hamano2011-03-292-4/+6
|\ \ \ \
| | * | | enable "no-done" extension only when serving over smart-httpJunio C Hamano2011-03-291-3/+4
| * | | | enable "no-done" extension only when fetching over smart-httpJunio C Hamano2011-03-291-1/+2
* | | | | Revert two "no-done" revertsJunio C Hamano2011-03-292-7/+31
* | | | | Revert "fetch-pack: Implement no-done capability"Junio C Hamano2011-03-291-15/+3
* | | | | Revert "upload-pack: Implement no-done capability"Junio C Hamano2011-03-291-16/+4
* | | | | Merge branch 'maint'Junio C Hamano2011-03-283-19/+20
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git tag documentation grammar fixes and readability updatesMichael Witten2011-03-281-18/+18
| * | | | grep: Add the option '--line-number'Joe Ratterman2011-03-282-1/+2
* | | | | tests: fix overeager scrubbing of environment variablesJens Lehmann2011-03-281-1/+10
* | | | | Improve test for pthreads flagGiuseppe Bilotta2011-03-281-0/+2
* | | | | vcs-svn: add missing cast to printf argumentJonathan Nieder2011-03-281-1/+2
* | | | | Update draft release note to 1.7.5Junio C Hamano2011-03-271-2/+15
* | | | | Merge branch 'mg/rev-list-n-parents'Junio C Hamano2011-03-279-22/+163
|\ \ \ \ \
| * | | | | tests: avoid nonportable {foo,bar} globJonathan Nieder2011-03-241-8/+8
| * | | | | rev-list --min-parents,--max-parents: doc, test and completionMichael J Gruber2011-03-234-3/+129
| * | | | | revision.c: introduce --min-parents and --max-parents optionsMichael J Gruber2011-03-235-10/+32
| * | | | | t6009: use test_commit() from test-lib.shMichael J Gruber2011-03-211-11/+4
* | | | | | Merge branch 'js/remove-unused-variables'Junio C Hamano2011-03-277-19/+5
|\ \ \ \ \ \
| * | | | | | Remove unused variablesJohannes Schindelin2011-03-227-19/+5
* | | | | | | Merge branch 'jp/completion-help-alias'Junio C Hamano2011-03-271-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-completion: Add git help completion for aliasesJakob Pfender2011-03-221-1/+1
* | | | | | | | Merge branch 'jc/index-update-if-able'Junio C Hamano2011-03-274-13/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | update $GIT_INDEX_FILE when there are racily clean entriesJunio C Hamano2011-03-211-1/+14
| * | | | | | | | diff/status: refactor opportunistic index updateJunio C Hamano2011-03-214-13/+16
* | | | | | | | | Merge branch 'jk/checkout-orphan-warning'Junio C Hamano2011-03-272-1/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: tweak detached-orphan warning formatJeff King2011-03-201-1/+4
| * | | | | | | | | checkout: clear commit marks after detached-orphan checkJeff King2011-03-202-0/+26
| * | | | | | | | | checkout: add basic tests for detached-orphan warningJeff King2011-03-201-0/+34
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano2011-03-274-2/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano2011-03-244-2/+86
* | | | | | | | | | Merge branch 'nd/index-doc'Junio C Hamano2011-03-271-0/+185
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | doc: technical details about the index file formatJunio C Hamano2011-03-231-37/+57
| * | | | | | | | | | doc: technical details about the index file formatNguyễn Thái Ngọc Duy2011-02-271-0/+165
* | | | | | | | | | | Merge branch 'jc/fetch-progressive-stride'Junio C Hamano2011-03-271-3/+18
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | fetch-pack: use smaller handshake window for initial requestJunio C Hamano2011-03-211-2/+4
| * | | | | | | | | | fetch-pack: progressively use larger handshake windowsJunio C Hamano2011-03-211-1/+6
| * | | | | | | | | | fetch-pack: factor out hardcoded handshake window sizeJunio C Hamano2011-03-211-3/+11
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-03-2611-83/+156
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | vcs-svn: handle log message with embedded NULJonathan Nieder2011-03-266-13/+94
| * | | | | | | | | | vcs-svn: avoid unnecessary copying of log message and authorJonathan Nieder2011-03-261-10/+10
| * | | | | | | | | | vcs-svn: remove buffer_read_stringJonathan Nieder2011-03-265-48/+17
| * | | | | | | | | | vcs-svn: make reading of properties binary-safeJonathan Nieder2011-03-262-14/+37
* | | | | | | | | | | Merge git-gui 0.14.0Junio C Hamano2011-03-2614-437/+3371
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0Pat Thoyts2011-03-251-47/+54
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-271-0/+7