summaryrefslogtreecommitdiff
path: root/merge-tree.c
AgeCommit message (Expand)Author
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