Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-merge --squash | Junio C Hamano | 2006-06-24 | 5 | -24/+72 |
* | git-pull: abort when fmt-merge-msg fails. | Junio C Hamano | 2006-06-24 | 1 | -1/+1 |
* | Merge branch 'pb/error' | Junio C Hamano | 2006-06-24 | 5 | -6/+52 |
|\ | |||||
| * | usage: minimum type fix. | Junio C Hamano | 2006-06-24 | 1 | -3/+3 |
| * | Customizable error handlers | Petr Baudis | 2006-06-24 | 2 | -4/+46 |
| * | git-merge: Don't use -p when outputting summary | Timo Hirvonen | 2006-06-23 | 1 | -1/+1 |
| * | git-commit: allow -e option anywhere on command line | Jeff King | 2006-06-23 | 1 | -1/+3 |
| * | patch-id: take "commit" prefix as well as "diff-tree" prefix | Johannes Schindelin | 2006-06-23 | 1 | -0/+2 |
* | | Makefile: do not recompile main programs when libraries have changed. | Junio C Hamano | 2006-06-22 | 1 | -1/+1 |
|/ | |||||
* | add GIT-CFLAGS to .gitignore | Matthias Kestenholz | 2006-06-22 | 1 | -0/+1 |
* | Tweak diff colors | Linus Torvalds | 2006-06-22 | 1 | -41/+58 |
* | Merge branch 'master' into nextv1.4.1-rc1 | Junio C Hamano | 2006-06-22 | 4 | -8/+34 |
|\ | |||||
| * | Merge branch 'js/lsfix' | Junio C Hamano | 2006-06-22 | 9 | -127/+200 |
| |\ | |||||
| * \ | Merge branch 'ew/rebase' | Junio C Hamano | 2006-06-22 | 3 | -10/+320 |
| |\ \ | |||||
| * \ \ | Merge branch 'jn/web' | Junio C Hamano | 2006-06-22 | 2 | -127/+490 |
| |\ \ \ | |||||
| * \ \ \ | Merge early parts of branch 'js/diff' | Junio C Hamano | 2006-06-22 | 3 | -11/+73 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jc/upload-corrupt' | Junio C Hamano | 2006-06-22 | 17 | -293/+338 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/waitpid' | Junio C Hamano | 2006-06-22 | 3 | -0/+15 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'ff/c99' | Junio C Hamano | 2006-06-22 | 24 | -107/+122 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'pb/config' | Junio C Hamano | 2006-06-22 | 5 | -11/+107 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'lt/objlist' | Junio C Hamano | 2006-06-22 | 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 |
| * | | | | | | | | | | Check and document the options to prevent mistakes. | Eric W. Biederman | 2006-06-22 | 2 | -0/+23 |
| * | | | | | | | | | | Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used. | Yakov Lerner | 2006-06-22 | 1 | -1/+2 |
* | | | | | | | | | | | Merge branch 'ew/rebase' into next | Junio C Hamano | 2006-06-22 | 1 | -13/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | rebase --merge: fix for rebasing more than 7 commits. | Junio C Hamano | 2006-06-22 | 1 | -13/+10 |
* | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | |