summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-04-011-1/+1
|\
| * Merge branch 'nd/index-doc' into maintJunio C Hamano2011-04-011-0/+185
| |\
| * \ Merge branch 'pk/stash-apply-status-relative' into maintJunio C Hamano2011-04-012-1/+21
| |\ \
| * \ \ Merge branch 'jc/maint-diff-q-filter' into maintJunio C Hamano2011-04-012-1/+9
| |\ \ \
| * \ \ \ Merge branch 'js/maint-stash-index-copy' into maintJunio C Hamano2011-04-011-6/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'mg/doc-bisect-tweak-worktree' into maintJunio C Hamano2011-04-011-23/+38
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jh/maint-do-not-track-non-branches' into maintJunio C Hamano2011-04-014-18/+39
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fk/maint-cvsimport-early-failure' into maintJunio C Hamano2011-04-011-1/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-report-offset' into maintJunio C Hamano2011-04-011-2/+14
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-apply-no-double-patch' into maintJunio C Hamano2011-04-011-1/+6
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/checkout-untracked-symlink' into maintJunio C Hamano2011-04-013-4/+62
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "checkout ambiguous ref bugfix" into maintJunio C Hamano2011-04-012-10/+72
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | docs: fix filter-branch subdir example for exotic repo namesJeff King2011-04-011-1/+1
* | | | | | | | | | | | | Git 1.7.5-rc0v1.7.5-rc0Junio C Hamano2011-03-312-2/+2
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | parse-remote: typofixJunio C Hamano2011-03-301-1/+1
* | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2011-03-307-53/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | contrib/thunderbird-patch-inline: do not require bash to run the scriptMaxin john2011-03-301-2/+2
| * | | | | | | | | | | | t8001: check the exit status of the command being testedJunio C Hamano2011-03-301-5/+6
| * | | | | | | | | | | | strbuf.h: remove a tad stale docs-in-comment and reference api-doc insteadMichael Witten2011-03-301-36/+1
| * | | | | | | | | | | | Typos: t/READMEMichael Witten2011-03-301-5/+4
| * | | | | | | | | | | | Documentation/config.txt: make truth value of numbers more explicitCarlos Martín Nieto2011-03-301-1/+1
| * | | | | | | | | | | | git-pack-objects.txt: fix grammatical errorsStephen Boyd2011-03-301-3/+3
| * | | | | | | | | | | | parse-remote: replace unnecessary sed invocationStephen Boyd2011-03-301-1/+2
* | | | | | | | | | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-03-303-9/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tests: kill backgrounded processes more robustlyJeff King2011-03-291-6/+6
| * | | | | | | | | | | | | vcs-svn: a void function shouldn't try to return somethingMichael Witten2011-03-291-1/+2
| * | | | | | | | | | | | | tests: make sure input to sed is newline terminatedJonathan Nieder2011-03-291-2/+6
| * | | | | | | | | | | | | vcs-svn: add missing cast to printf argumentJonathan Nieder2011-03-271-1/+2
* | | | | | | | | | | | | | 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-281-15/+3
* | | | | | | | | | | | | | | | | Revert "upload-pack: Implement no-done capability"Junio C Hamano2011-03-281-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-261-2/+15
* | | | | | | | | | | | | | | | | Merge branch 'mg/rev-list-n-parents'Junio C Hamano2011-03-269-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