Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'jn/web' into next | Junio C Hamano | 2006-06-22 | 1 | -5/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge branch 'master' into next | Junio C Hamano | 2006-06-21 | 1 | -16/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Fix grow_refs_hash() | Linus Torvalds | 2006-06-21 | 1 | -16/+14 | |
* | | | | | | | | | | | Merge branch 'jc/upload-corrupt' into next | Junio C Hamano | 2006-06-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | daemon: send stderr to /dev/null instead of closing. | Junio C Hamano | 2006-06-21 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'jn/web' into next | Junio C Hamano | 2006-06-21 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | gitweb: Make use of $PATH_INFO for project parameter | Jakub Narebski | 2006-06-21 | 1 | -1/+2 | |
* | | | | | | | | | | | Merge branch 'ew/rebase' into next | Junio C Hamano | 2006-06-21 | 4 | -10/+326 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | 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 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | object-refs: avoid division by zero | Andre Noll | 2006-06-21 | 1 | -0/+3 | |
* | | | | | | | | | | Merge branch 'ff/c99' into next | Junio C Hamano | 2006-06-21 | 19 | -69/+72 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Remove all void-pointer arithmetic. | Florian Forster | 2006-06-20 | 19 | -69/+72 | |
* | | | | | | | | | | Merge branch 'jc/upload-corrupt' into next | Junio C Hamano | 2006-06-21 | 17 | -296/+342 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | 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 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fix possible out-of-bounds array access | Uwe Zeisberger | 2006-06-21 | 1 | -4/+5 | |
* | | | | | | | | | Merge branch 'jn/web' into next | Junio C Hamano | 2006-06-21 | 2 | -24/+33 | |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | | | Merge branch 'master' into next | Junio C Hamano | 2006-06-21 | 2 | -26/+35 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | checkout -f: do not leave untracked working tree files. | Junio C Hamano | 2006-06-20 | 1 | -2/+1 | |
| * | | | | | | | | Log peer address when git-daemon called from inetd | David Woodhouse | 2006-06-20 | 1 | -24/+34 | |
* | | | | | | | | | Merge branch 'jn/web' into next | Junio C Hamano | 2006-06-20 | 2 | -154/+252 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | | | Merge branch 'jn/web' into next | Junio C Hamano | 2006-06-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Fix: Support for the standard mime.types map in gitweb | Jakub Narebski | 2006-06-20 | 1 | -1/+1 | |
* | | | | | | | | | Merge branch 'master' into next | Junio C Hamano | 2006-06-20 | 3 | -6/+41 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | git-svn: fix --rmdir when using SVN:: libraries | Eric Wong | 2006-06-20 | 3 | -6/+41 | |
* | | | | | | | | | Merge branch 'jn/web' into next | Junio C Hamano | 2006-06-20 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | gitweb: add type="text/css" to stylesheet link | Jakub Narebski | 2006-06-19 | 1 | -2/+2 | |
* | | | | | | | | | Merge branch 'pb/config' into next | Junio C Hamano | 2006-06-20 | 2 | -3/+1 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | 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 | |
* | | | | | | | | | Merge branch 'jc/waitpid' into next | Junio C Hamano | 2006-06-19 | 3 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| * | | | | | | | | Restore SIGCHLD to SIG_DFL where we care about waitpid(). | Junio C Hamano | 2006-06-19 | 3 | -0/+15 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'lt/objlist' into next | Junio C Hamano | 2006-06-19 | 24 | -148/+241 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | Add "named object array" concept | Linus Torvalds | 2006-06-19 | 14 | -131/+151 | |
| |/ / / / / / | ||||||
| * | | | | | | xdiff: minor changes to match libxdiff-0.21 | Junio C Hamano | 2006-06-19 | 2 | -7/+5 | |
| * | | | | | | fix rfc2047 formatter. | Junio C Hamano | 2006-06-19 | 1 | -4/+17 | |
| * | | | | | | Fix t8001-annotate and t8002-blame for ActiveState Perl | Dennis Stosberg | 2006-06-19 | 1 | -1/+1 | |
| * | | | | | | Add specialized object allocator | Linus Torvalds | 2006-06-19 | 7 | -5/+67 | |
| | | | | | | | ||||||
| \ \ \ \ \ \ | ||||||
| \ \ \ \ \ \ | ||||||
| \ \ \ \ \ \ | ||||||
*---. \ \ \ \ \ \ | Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next | Junio C Hamano | 2006-06-19 | 7 | -71/+319 | |
|\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | | | |/ / / / | | | |/| | | / | | |_|_|_|_|/ | |/| | | | | |