aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/read-tree'Junio C Hamano2006-11-07
|\
| * merge-recursive: adjust to loosened "working file clobbered" checkJunio C Hamano2006-10-27
| * merge-recursive: make a few functions static.Junio C Hamano2006-10-27
| * merge-recursive: use abbreviated commit object name.Junio C Hamano2006-10-27
* | merge-recursive implicitely depends on trust_executable_bitAlex Riesen2006-11-06
|/
* Add hash_sha1_file()Rene Scharfe2006-10-14
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Use xmalloc instead of mallocJonas Fonseca2006-08-31
* hashcpy/hashcmp remaining bits.Junio C Hamano2006-08-23
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-12
* merge-recur: do not die unnecessarilyJohannes Schindelin2006-08-09
* merge-recur: try to merge older merge bases firstJohannes Schindelin2006-08-09
* merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin2006-08-09
* merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin2006-08-09
* merge-recur: do not call git-write-treeJohannes Schindelin2006-08-09
* merge-recursive: fix rename handlingJohannes Schindelin2006-08-04
* merge-recur: virtual commits shall never be parsedJohannes Schindelin2006-07-31
* merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin2006-07-30
* merge-recur: fix thinko in unique_path()Johannes Schindelin2006-07-30
* merge-recur: Explain why sha_eq() and struct stage_data cannot goJohannes Schindelin2006-07-27
* merge-recur: Cleanup last mixedCase variables...Johannes Schindelin2006-07-27
* merge-recur: Fix compiler warning with -pedanticJohannes Schindelin2006-07-27
* merge-recur: Remove dead codeJohannes Schindelin2006-07-27
* merge-recur: Get rid of debug codeJohannes Schindelin2006-07-27
* merge-recur: Convert variable names to lower_caseJohannes Schindelin2006-07-27
* Cumulative update of merge-recursive in CJohannes Schindelin2006-07-27
* Merge branch 'lt/unitype' into js/c-merge-recursiveJunio C Hamano2006-07-13
* Status update on merge-recursive in CJohannes Schindelin2006-07-13
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 01:12:21 +0000