summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ew/rebase'Junio C Hamano2006-06-223-10/+320
|\
| * rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano2006-06-221-13/+10
| * 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
* | Merge branch 'jn/web'Junio C Hamano2006-06-222-127/+490
|\ \
| * | gitweb: whitespace cleanup around '='Jakub Narebski2006-06-221-4/+4
| * | gitweb: Use $hash_base as $search_hash if possibleTimo Hirvonen2006-06-221-1/+3
| * | gitweb: Make use of $PATH_INFO for project parameterJakub Narebski2006-06-211-1/+2
| * | 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
| * | gitweb: style done with stylesheetJakub Narebski2006-06-202-154/+246
| * | gitweb: A couple of page title tweakingJakub Narebski2006-06-201-0/+6
| * | Fix: Support for the standard mime.types map in gitwebJakub Narebski2006-06-201-1/+1
| * | gitweb: add type="text/css" to stylesheet linkJakub Narebski2006-06-191-2/+2
| * | Make CSS file gitweb/gitweb.css more readableJakub Narebski2006-06-191-50/+222
| * | Fix gitweb stylesheetJakub Narebski2006-06-181-0/+4
| * | Support for the standard mime.types map in gitwebPetr Baudis2006-06-181-0/+44
| * | gitweb: text files for 'blob_plain' action without charset by defaultJakub Narebski2006-06-181-3/+3
| * | gitweb: safely output binary files for 'blob_plain' actionJakub Narebski2006-06-181-4/+39
| * | Move gitweb style to gitweb.cssJakub Narebski2006-06-182-60/+58
* | | Merge early parts of branch 'js/diff'Junio C Hamano2006-06-223-11/+73
|\ \ \
| * | | diff options: add --colorJohannes Schindelin2006-06-173-11/+73
* | | | Merge branch 'jc/upload-corrupt'Junio C Hamano2006-06-2217-293/+338
|\ \ \ \
| * | | | daemon: send stderr to /dev/null instead of closing.Junio C Hamano2006-06-211-1/+1
| * | | | 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
* | | | | Merge branch 'jc/waitpid'Junio C Hamano2006-06-223-0/+15
|\ \ \ \ \
| * | | | | Restore SIGCHLD to SIG_DFL where we care about waitpid().Junio C Hamano2006-06-193-0/+15
* | | | | | Merge branch 'ff/c99'Junio C Hamano2006-06-2224-107/+122
|\ \ \ \ \ \
| * | | | | | Remove all void-pointer arithmetic.Florian Forster2006-06-2019-69/+72
| * | | | | | Change types used in bitfields to be `int's.Florian Forster2006-06-181-1/+1
| * | | | | | Don't use empty structure initializers.Florian Forster2006-06-181-2/+1
| * | | | | | Cast pointers to `void *' when used in a format.Florian Forster2006-06-181-2/+2
| * | | | | | Don't instantiate structures with FAMs.Florian Forster2006-06-181-19/+22
| * | | | | | Initialize FAMs using `FLEX_ARRAY'.Florian Forster2006-06-181-1/+2
| * | | | | | Remove ranges from switch statements.Florian Forster2006-06-183-13/+22
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'pb/config'Junio C Hamano2006-06-225-11/+107
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | 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
| * | | | | | Support for extracting configuration from different filesPetr Baudis2006-06-182-1/+23
| |/ / / / /
* | | | | | Merge branch 'lt/objlist'Junio C Hamano2006-06-2214-131/+151
|\ \ \ \ \ \
| * | | | | | Add "named object array" conceptLinus Torvalds2006-06-1914-131/+151
| | |/ / / / | |/| | | |
* | | | | | git-svn: fix commit --edit flag when using SVN:: librariesEric Wong2006-06-221-6/+8
* | | | | | Makefile: do not force unneeded recompilation upon GIT_VERSION changesJunio C Hamano2006-06-221-1/+1