summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/upload-corrupt' into nextJunio C Hamano2006-06-211-1/+1
|\
| * daemon: send stderr to /dev/null instead of closing.Junio C Hamano2006-06-211-1/+1
* | Merge branch 'jn/web' into nextJunio C Hamano2006-06-211-1/+2
|\ \
| * | gitweb: Make use of $PATH_INFO for project parameterJakub Narebski2006-06-211-1/+2
* | | Merge branch 'ew/rebase' into nextJunio C Hamano2006-06-214-10/+326
|\ \ \
| * | | rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2006-06-212-0/+15
| * | | Add renaming-rebase test.Junio C Hamano2006-06-211-0/+106
| * | | rebase: Allow merge strategies to be used when rebasingEric Wong2006-06-212-10/+202
| * | | object-refs: avoid division by zeroAndre Noll2006-06-211-0/+3
* | | | Merge branch 'ff/c99' into nextJunio C Hamano2006-06-2119-69/+72
|\ \ \ \
| * | | | Remove all void-pointer arithmetic.Florian Forster2006-06-2019-69/+72
* | | | | Merge branch 'jc/upload-corrupt' into nextJunio C Hamano2006-06-2117-296/+342
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | upload-pack/fetch-pack: support side-band communicationJunio C Hamano2006-06-216-23/+139
| * | | | Retire git-clone-packJunio C Hamano2006-06-219-263/+7
| * | | | upload-pack: prepare for sideband message support.Junio C Hamano2006-06-212-7/+43
| * | | | upload-pack: avoid sending an incomplete pack upon failureJunio C Hamano2006-06-211-14/+163
| | |/ / | |/| |
| * | | Fix possible out-of-bounds array accessUwe Zeisberger2006-06-211-4/+5
* | | | Merge branch 'jn/web' into nextJunio C Hamano2006-06-212-24/+33
|\ \ \ \ | | |_|/ | |/| |
| * | | Move $gitbin earlier in gitweb.cgiJakub Narebski2006-06-211-3/+3
| * | | Add git version to gitweb outputJakub Narebski2006-06-211-2/+11
| * | | gitweb: whitespace cleanupJakub Narebski2006-06-212-21/+21
* | | | Merge branch 'master' into nextJunio C Hamano2006-06-212-26/+35
|\ \ \ \ | | |/ / | |/| |
| * | | checkout -f: do not leave untracked working tree files.Junio C Hamano2006-06-201-2/+1
| * | | Log peer address when git-daemon called from inetdDavid Woodhouse2006-06-201-24/+34
* | | | Merge branch 'jn/web' into nextJunio C Hamano2006-06-202-154/+252
|\ \ \ \ | | |/ / | |/| |
| * | | gitweb: style done with stylesheetJakub Narebski2006-06-202-154/+246
| * | | gitweb: A couple of page title tweakingJakub Narebski2006-06-201-0/+6
* | | | Merge branch 'jn/web' into nextJunio C Hamano2006-06-201-1/+1
|\ \ \ \ | |/ / /
| * | | Fix: Support for the standard mime.types map in gitwebJakub Narebski2006-06-201-1/+1
* | | | Merge branch 'master' into nextJunio C Hamano2006-06-203-6/+41
|\ \ \ \ | | |/ / | |/| |
| * | | git-svn: fix --rmdir when using SVN:: librariesEric Wong2006-06-203-6/+41
* | | | Merge branch 'jn/web' into nextJunio C Hamano2006-06-201-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | gitweb: add type="text/css" to stylesheet linkJakub Narebski2006-06-191-2/+2
* | | | Merge branch 'pb/config' into nextJunio C Hamano2006-06-202-3/+1
|\ \ \ \
| * | | | git_config: access() returns 0 on success, not > 0Johannes Schindelin2006-06-201-1/+1
| * | | | repo-config: Fix late-night bugJohannes Schindelin2006-06-201-2/+0
* | | | | Merge branch 'jc/waitpid' into nextJunio C Hamano2006-06-193-0/+15
|\ \ \ \ \
| * | | | | Restore SIGCHLD to SIG_DFL where we care about waitpid().Junio C Hamano2006-06-193-0/+15
| | |_|/ / | |/| | |
* | | | | Merge branch 'lt/objlist' into nextJunio C Hamano2006-06-1924-148/+241
|\ \ \ \ \
| * | | | | Add "named object array" conceptLinus Torvalds2006-06-1914-131/+151
| |/ / / /
| * | | | xdiff: minor changes to match libxdiff-0.21Junio C Hamano2006-06-192-7/+5
| * | | | fix rfc2047 formatter.Junio C Hamano2006-06-191-4/+17
| * | | | Fix t8001-annotate and t8002-blame for ActiveState PerlDennis Stosberg2006-06-191-1/+1
| * | | | Add specialized object allocatorLinus Torvalds2006-06-197-5/+67
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into nextJunio C Hamano2006-06-197-71/+319
|\ \ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Make CSS file gitweb/gitweb.css more readableJakub Narebski2006-06-191-50/+222
| | * | | | Read configuration also from $HOME/.gitconfigJohannes Schindelin2006-06-192-15/+58
| | * | | | Fix setting config variables with an alternative GIT_CONFIGJohannes Schindelin2006-06-193-4/+37
| * | | | | Initialize lock_file struct to all zero.Johannes Schindelin2006-06-192-2/+2
* | | | | | Merge early parts of branch 'ff/c99'Junio C Hamano2006-06-188-38/+50
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |