summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "daemon: add upload-tar service."Junio C Hamano2006-09-072-13/+1
* multi-service daemon: documentationJunio C Hamano2006-08-281-8/+39
* daemon: add upload-tar service.Junio C Hamano2006-08-281-4/+11
* daemon: prepare for multiple services.Junio C Hamano2006-08-281-7/+106
* Add git-zip-tree to .gitignoreRene Scharfe2006-08-281-0/+1
* free(NULL) is perfectly valid.Junio C Hamano2006-08-2810-44/+21
* Use xcalloc instead of callocJonas Fonseca2006-08-282-2/+2
* Use fstat instead of fseekJonas Fonseca2006-08-281-5/+3
* Merge branch 'gl/cleanup-next'Junio C Hamano2006-08-281-16/+14
|\
| * hashcpy/hashcmp remaining bits.Junio C Hamano2006-08-231-6/+4
| * Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-10/+10
| * Merge branch 'gl/cleanup' into gl/cleanup-nextJunio C Hamano2006-08-23106-2506/+3445
| |\
* | | Merge branch 'js/c-merge-recursive'Junio C Hamano2006-08-287-5/+1406
|\| |
| * | Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-1384-479/+1486
| |\ \
| * | | discard_cache(): discard index, even if no file was mmap()edJohannes Schindelin2006-08-101-3/+3
| * | | merge-recur: do not die unnecessarilyJohannes Schindelin2006-08-091-2/+4
| * | | merge-recur: try to merge older merge bases firstJohannes Schindelin2006-08-091-1/+12
| * | | merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin2006-08-091-0/+12
| * | | merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin2006-08-091-13/+9
| * | | merge-recur: do not call git-write-treeJohannes Schindelin2006-08-091-24/+20
| * | | merge-recursive: fix rename handlingJohannes Schindelin2006-08-041-2/+4
| * | | .gitignore: git-merge-recur is a built file.Junio C Hamano2006-08-042-1/+2
| * | | merge-recur: virtual commits shall never be parsedJohannes Schindelin2006-08-011-0/+2
| * | | merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin2006-07-311-28/+52
| * | | Merge branch 'js/read-tree' into js/c-merge-recursiveJunio C Hamano2006-07-31103-1668/+2902
| |\ \ \
| * | | | merge-recur: fix thinko in unique_path()Johannes Schindelin2006-07-301-2/+2
| * | | | Makefile: git-merge-recur depends on xdiff libraries.Junio C Hamano2006-07-281-1/+1
| * | | | merge-recur: Explain why sha_eq() and struct stage_data cannot goJohannes Schindelin2006-07-281-5/+4
| * | | | merge-recur: Cleanup last mixedCase variables...Johannes Schindelin2006-07-281-23/+23
| * | | | merge-recur: Fix compiler warning with -pedanticJohannes Schindelin2006-07-281-1/+4
| * | | | merge-recur: Remove dead codeJohannes Schindelin2006-07-281-22/+0
| * | | | merge-recur: Get rid of debug codeJohannes Schindelin2006-07-281-64/+1
| * | | | merge-recur: Convert variable names to lower_caseJohannes Schindelin2006-07-281-191/+189
| * | | | Cumulative update of merge-recursive in CJohannes Schindelin2006-07-281-526/+364
| * | | | Merge branch 'lt/unitype' into js/c-merge-recursiveJunio C Hamano2006-07-1424-96/+91
| |\ \ \ \
| * | | | | recur vs recursive: help testing without touching too many stuff.Junio C Hamano2006-07-144-12/+36
| * | | | | Status update on merge-recursive in CJohannes Schindelin2006-07-1410-52/+1773
* | | | | | Merge branch 'ts/daemon'Junio C Hamano2006-08-282-5/+58
|\ \ \ \ \ \
| * | | | | | Added support for dropping privileges to git-daemon.Tilman Sauerbeck2006-08-232-5/+58
* | | | | | | Merge branch 'jc/apply'Junio C Hamano2006-08-285-33/+363
|\ \ \ \ \ \ \
| * | | | | | | git-apply --reject: finishing touches.Junio C Hamano2006-08-282-3/+3
| * | | | | | | apply --reject: count hunks starting from 1, not 0Junio C Hamano2006-08-231-1/+1
| * | | | | | | git-apply --verboseJunio C Hamano2006-08-182-2/+84
| * | | | | | | git-apply --reject: send rejects to .rej files.Junio C Hamano2006-08-182-49/+80
| * | | | | | | git-apply --rejectJunio C Hamano2006-08-173-23/+198
| * | | | | | | apply --reverse: tie it all together.Junio C Hamano2006-08-173-6/+49
| * | | | | | | diff.c: make binary patch reversible.Junio C Hamano2006-08-171-2/+8
| * | | | | | | builtin-apply --reverse: two bugfixes.Junio C Hamano2006-08-171-3/+7
* | | | | | | | git-reset: remove unused variableRene Scharfe2006-08-281-3/+0
* | | | | | | | git-cherry: remove unused variableRene Scharfe2006-08-281-3/+0