summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-merge --squashJunio C Hamano2006-06-245-24/+72
* git-pull: abort when fmt-merge-msg fails.Junio C Hamano2006-06-241-1/+1
* Merge branch 'pb/error'Junio C Hamano2006-06-245-6/+52
|\
| * usage: minimum type fix.Junio C Hamano2006-06-241-3/+3
| * Customizable error handlersPetr Baudis2006-06-242-4/+46
| * git-merge: Don't use -p when outputting summaryTimo Hirvonen2006-06-231-1/+1
| * git-commit: allow -e option anywhere on command lineJeff King2006-06-231-1/+3
| * patch-id: take "commit" prefix as well as "diff-tree" prefixJohannes Schindelin2006-06-231-0/+2
* | Makefile: do not recompile main programs when libraries have changed.Junio C Hamano2006-06-221-1/+1
|/
* add GIT-CFLAGS to .gitignoreMatthias Kestenholz2006-06-221-0/+1
* Tweak diff colorsLinus Torvalds2006-06-221-41/+58
* Merge branch 'master' into nextv1.4.1-rc1Junio C Hamano2006-06-224-8/+34
|\
| * Merge branch 'js/lsfix'Junio C Hamano2006-06-229-127/+200
| |\
| * \ Merge branch 'ew/rebase'Junio C Hamano2006-06-223-10/+320
| |\ \
| * \ \ Merge branch 'jn/web'Junio C Hamano2006-06-222-127/+490
| |\ \ \
| * \ \ \ Merge early parts of branch 'js/diff'Junio C Hamano2006-06-223-11/+73
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/upload-corrupt'Junio C Hamano2006-06-2217-293/+338
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/waitpid'Junio C Hamano2006-06-223-0/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'ff/c99'Junio C Hamano2006-06-2224-107/+122
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'pb/config'Junio C Hamano2006-06-225-11/+107
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'lt/objlist'Junio C Hamano2006-06-2214-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
| * | | | | | | | | | Check and document the options to prevent mistakes.Eric W. Biederman2006-06-222-0/+23
| * | | | | | | | | | Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.Yakov Lerner2006-06-221-1/+2
* | | | | | | | | | | Merge branch 'ew/rebase' into nextJunio C Hamano2006-06-221-13/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | rebase --merge: fix for rebasing more than 7 commits.Junio C Hamano2006-06-221-13/+10
* | | | | | | | | | | Merge branch 'jn/web' into nextJunio C Hamano2006-06-221-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | gitweb: whitespace cleanup around '='Jakub Narebski2006-06-221-4/+4
| * | | | | | | | | | gitweb: Use $hash_base as $search_hash if possibleTimo Hirvonen2006-06-221-1/+3
* | | | | | | | | | | Merge branch 'master' into nextJunio C Hamano2006-06-211-16/+14
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix grow_refs_hash()Linus Torvalds2006-06-211-16/+14
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |