summaryrefslogtreecommitdiff
path: root/merge-tree.c
AgeCommit message (Expand)Author
2010-01-22make "git merge-tree" a built-inLinus Torvalds
2010-01-17merge-tree: use ll_merge() not xdl_merge()Junio C Hamano
2009-02-04Replace deprecated dashed git commands in usageAlexander Potashev
2009-01-26Add calls to git_extract_argv0_path() in programs that call git_config_*Steffen Prohaska
2008-10-08Replace xmalloc/memset(0) pairs with xcallocBrandon Casey
2008-03-09Make 'traverse_trees()' traverse conflicting DF entries in parallelLinus Torvalds
2008-03-09Add return value to 'traverse_tree()' callbackLinus Torvalds
2008-03-09Make 'traverse_tree()' use linked structure rather than 'const char *base'Linus Torvalds
2007-12-14xdl_diff: identify call sites.Junio C Hamano
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin
2007-03-21Remove "pathlen" from "struct name_entry"Linus Torvalds
2007-02-27convert object type handling from a string to a numberNicolas Pitre
2006-09-14Handle invalid argc gentlyDmitry V. Levin
2006-09-14Make count-objects, describe and merge-tree work in subdirectoryDmitry V. Levin
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes
2006-06-29Improved three-way blob merging codeLinus Torvalds
2006-06-29Prepare "git-merge-tree" for future workLinus Torvalds
2006-05-08Merge branch 'fix'Junio C Hamano
2006-05-08Separate object name errors from usage errorsDmitry V. Levin
2006-05-04sha1_to_hex() usage cleanupLinus Torvalds
2006-03-30tree/diff header cleanup.Junio C Hamano
2006-02-16git-merge-tree: generalize the "traverse <n> trees in sync" functionalityLinus Torvalds
2006-02-16Handling large files with GITLinus Torvalds
2006-02-16Handling large files with GITLinus Torvalds
2005-04-16Remove "merge-tree.c"Linus Torvalds
2005-04-16[PATCH] Add '-z' to merge-tree.cJunio C Hamano
2005-04-14Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds