summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2007-01-10merge-recursive: do not use on-file index when not needed.Junio C Hamano
2007-01-10Speed-up recursive by flushing index only once for all entriesAlex Riesen
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft
2006-12-29Allow merging bare trees in merge-recursive.Shawn O. Pearce
2006-12-29Move better_branch_name above get_ref in merge-recursive.Shawn O. Pearce
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce
2006-12-23Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce
2006-12-20Merge branch 'jc/clone'Junio C Hamano
2006-12-20simplify inclusion of system header files.Junio C Hamano
2006-12-19Use preprocessor constants for environment variable names.Junio C Hamano
2006-12-13Merge branch 'js/merge'Junio C Hamano
2006-12-13Remove uncontested renamed files during merge.Shawn Pearce
2006-12-13merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin
2006-12-13Merge branch 'master' into js/mergeJunio C Hamano
2006-12-11Make sure the empty tree exists when needed in merge-recursive.Shawn O. Pearce
2006-12-03merge-recursive: use xdl_merge().Junio C Hamano
2006-11-07Merge branch 'jc/read-tree'Junio C Hamano
2006-11-06merge-recursive implicitely depends on trust_executable_bitAlex Riesen
2006-10-28merge-recursive: adjust to loosened "working file clobbered" checkJunio C Hamano
2006-10-28merge-recursive: make a few functions static.Junio C Hamano
2006-10-28merge-recursive: use abbreviated commit object name.Junio C Hamano
2006-10-14Add hash_sha1_file()Rene Scharfe
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce
2006-08-31Use xmalloc instead of mallocJonas Fonseca
2006-08-23hashcpy/hashcmp remaining bits.Junio C Hamano
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce
2006-08-13Merge branch 'master' into js/c-merge-recursiveJunio C Hamano
2006-08-09merge-recur: do not die unnecessarilyJohannes Schindelin
2006-08-09merge-recur: try to merge older merge bases firstJohannes Schindelin
2006-08-09merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin
2006-08-09merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin
2006-08-09merge-recur: do not call git-write-treeJohannes Schindelin
2006-08-04merge-recursive: fix rename handlingJohannes Schindelin
2006-07-31merge-recur: virtual commits shall never be parsedJohannes Schindelin
2006-07-31merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin
2006-07-30merge-recur: fix thinko in unique_path()Johannes Schindelin
2006-07-28merge-recur: Explain why sha_eq() and struct stage_data cannot goJohannes Schindelin
2006-07-28merge-recur: Cleanup last mixedCase variables...Johannes Schindelin
2006-07-28merge-recur: Fix compiler warning with -pedanticJohannes Schindelin
2006-07-28merge-recur: Remove dead codeJohannes Schindelin
2006-07-28merge-recur: Get rid of debug codeJohannes Schindelin
2006-07-28merge-recur: Convert variable names to lower_caseJohannes Schindelin
2006-07-28Cumulative update of merge-recursive in CJohannes Schindelin
2006-07-14Merge branch 'lt/unitype' into js/c-merge-recursiveJunio C Hamano
2006-07-14Status update on merge-recursive in CJohannes Schindelin