Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ew/rebase' | Junio C Hamano | 2006-06-22 | 3 | -10/+320 |
|\ | |||||
| * | rebase --merge: fix for rebasing more than 7 commits. | Junio C Hamano | 2006-06-22 | 1 | -13/+10 |
| * | rebase: error out for NO_PYTHON if they use recursive merge | Eric Wong | 2006-06-21 | 2 | -0/+15 |
| * | Add renaming-rebase test. | Junio C Hamano | 2006-06-21 | 1 | -0/+106 |
| * | rebase: Allow merge strategies to be used when rebasing | Eric Wong | 2006-06-21 | 2 | -10/+202 |
* | | Merge branch 'jn/web' | Junio C Hamano | 2006-06-22 | 2 | -127/+490 |
|\ \ | |||||
| * | | gitweb: whitespace cleanup around '=' | Jakub Narebski | 2006-06-22 | 1 | -4/+4 |
| * | | gitweb: Use $hash_base as $search_hash if possible | Timo Hirvonen | 2006-06-22 | 1 | -1/+3 |
| * | | gitweb: Make use of $PATH_INFO for project parameter | Jakub Narebski | 2006-06-21 | 1 | -1/+2 |
| * | | Move $gitbin earlier in gitweb.cgi | Jakub Narebski | 2006-06-21 | 1 | -3/+3 |
| * | | Add git version to gitweb output | Jakub Narebski | 2006-06-21 | 1 | -2/+11 |
| * | | gitweb: whitespace cleanup | Jakub Narebski | 2006-06-21 | 2 | -21/+21 |
| * | | gitweb: style done with stylesheet | Jakub Narebski | 2006-06-20 | 2 | -154/+246 |
| * | | gitweb: A couple of page title tweaking | Jakub Narebski | 2006-06-20 | 1 | -0/+6 |
| * | | Fix: Support for the standard mime.types map in gitweb | Jakub Narebski | 2006-06-20 | 1 | -1/+1 |
| * | | gitweb: add type="text/css" to stylesheet link | Jakub Narebski | 2006-06-19 | 1 | -2/+2 |
| * | | Make CSS file gitweb/gitweb.css more readable | Jakub Narebski | 2006-06-19 | 1 | -50/+222 |
| * | | Fix gitweb stylesheet | Jakub Narebski | 2006-06-18 | 1 | -0/+4 |
| * | | Support for the standard mime.types map in gitweb | Petr Baudis | 2006-06-18 | 1 | -0/+44 |
| * | | gitweb: text files for 'blob_plain' action without charset by default | Jakub Narebski | 2006-06-18 | 1 | -3/+3 |
| * | | gitweb: safely output binary files for 'blob_plain' action | Jakub Narebski | 2006-06-18 | 1 | -4/+39 |
| * | | Move gitweb style to gitweb.css | Jakub Narebski | 2006-06-18 | 2 | -60/+58 |
* | | | Merge early parts of branch 'js/diff' | Junio C Hamano | 2006-06-22 | 3 | -11/+73 |
|\ \ \ | |||||
| * | | | diff options: add --color | Johannes Schindelin | 2006-06-17 | 3 | -11/+73 |
* | | | | Merge branch 'jc/upload-corrupt' | Junio C Hamano | 2006-06-22 | 17 | -293/+338 |
|\ \ \ \ | |||||
| * | | | | daemon: send stderr to /dev/null instead of closing. | Junio C Hamano | 2006-06-21 | 1 | -1/+1 |
| * | | | | upload-pack/fetch-pack: support side-band communication | Junio C Hamano | 2006-06-21 | 6 | -23/+139 |
| * | | | | Retire git-clone-pack | Junio C Hamano | 2006-06-21 | 9 | -263/+7 |
| * | | | | upload-pack: prepare for sideband message support. | Junio C Hamano | 2006-06-21 | 2 | -7/+43 |
| * | | | | upload-pack: avoid sending an incomplete pack upon failure | Junio C Hamano | 2006-06-21 | 1 | -14/+163 |
* | | | | | Merge branch 'jc/waitpid' | Junio C Hamano | 2006-06-22 | 3 | -0/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Restore SIGCHLD to SIG_DFL where we care about waitpid(). | Junio C Hamano | 2006-06-19 | 3 | -0/+15 |
* | | | | | | Merge branch 'ff/c99' | Junio C Hamano | 2006-06-22 | 24 | -107/+122 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove all void-pointer arithmetic. | Florian Forster | 2006-06-20 | 19 | -69/+72 |
| * | | | | | | Change types used in bitfields to be `int's. | Florian Forster | 2006-06-18 | 1 | -1/+1 |
| * | | | | | | Don't use empty structure initializers. | Florian Forster | 2006-06-18 | 1 | -2/+1 |
| * | | | | | | Cast pointers to `void *' when used in a format. | Florian Forster | 2006-06-18 | 1 | -2/+2 |
| * | | | | | | Don't instantiate structures with FAMs. | Florian Forster | 2006-06-18 | 1 | -19/+22 |
| * | | | | | | Initialize FAMs using `FLEX_ARRAY'. | Florian Forster | 2006-06-18 | 1 | -1/+2 |
| * | | | | | | Remove ranges from switch statements. | Florian Forster | 2006-06-18 | 3 | -13/+22 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'pb/config' | Junio C Hamano | 2006-06-22 | 5 | -11/+107 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git_config: access() returns 0 on success, not > 0 | Johannes Schindelin | 2006-06-20 | 1 | -1/+1 |
| * | | | | | | repo-config: Fix late-night bug | Johannes Schindelin | 2006-06-20 | 1 | -2/+0 |
| * | | | | | | Read configuration also from $HOME/.gitconfig | Johannes Schindelin | 2006-06-19 | 2 | -15/+58 |
| * | | | | | | Fix setting config variables with an alternative GIT_CONFIG | Johannes Schindelin | 2006-06-19 | 3 | -4/+37 |
| * | | | | | | Support for extracting configuration from different files | Petr Baudis | 2006-06-18 | 2 | -1/+23 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'lt/objlist' | Junio C Hamano | 2006-06-22 | 14 | -131/+151 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add "named object array" concept | Linus Torvalds | 2006-06-19 | 14 | -131/+151 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | git-svn: fix commit --edit flag when using SVN:: libraries | Eric Wong | 2006-06-22 | 1 | -6/+8 |
* | | | | | | Makefile: do not force unneeded recompilation upon GIT_VERSION changes | Junio C Hamano | 2006-06-22 | 1 | -1/+1 |