aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2006-10-14Add hash_sha1_file()Rene Scharfe1-4/+1
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce1-7/+7
2006-08-31Use xmalloc instead of mallocJonas Fonseca1-3/+3
2006-08-23hashcpy/hashcmp remaining bits.Junio C Hamano1-6/+4
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-10/+10
2006-08-12Merge branch 'master' into js/c-merge-recursiveJunio C Hamano1-3/+1
2006-08-09merge-recur: do not die unnecessarilyJohannes Schindelin1-2/+4
2006-08-09merge-recur: try to merge older merge bases firstJohannes Schindelin1-1/+12
2006-08-09merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin1-0/+12
2006-08-09merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin1-13/+9
2006-08-09merge-recur: do not call git-write-treeJohannes Schindelin1-24/+20
2006-08-04merge-recursive: fix rename handlingJohannes Schindelin1-2/+4
2006-07-31merge-recur: virtual commits shall never be parsedJohannes Schindelin1-0/+2
2006-07-30merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin1-28/+52
2006-07-30merge-recur: fix thinko in unique_path()Johannes Schindelin1-2/+2
2006-07-27merge-recur: Explain why sha_eq() and struct stage_data cannot goJohannes Schindelin1-5/+4
2006-07-27merge-recur: Cleanup last mixedCase variables...Johannes Schindelin1-23/+23
2006-07-27merge-recur: Fix compiler warning with -pedanticJohannes Schindelin1-1/+4
2006-07-27merge-recur: Remove dead codeJohannes Schindelin1-22/+0
2006-07-27merge-recur: Get rid of debug codeJohannes Schindelin1-64/+1
2006-07-27merge-recur: Convert variable names to lower_caseJohannes Schindelin1-191/+189
2006-07-27Cumulative update of merge-recursive in CJohannes Schindelin1-526/+364
2006-07-13Merge branch 'lt/unitype' into js/c-merge-recursiveJunio C Hamano1-1/+1
2006-07-13Status update on merge-recursive in CJohannes Schindelin1-0/+1560
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-26 21:44:57 +0000