aboutsummaryrefslogtreecommitdiffstats
path: root/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2006-09-14Handle invalid argc gentlyDmitry V. Levin1-1/+1
2006-09-13Make count-objects, describe and merge-tree work in subdirectoryDmitry V. Levin1-0/+2
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce1-2/+2
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-1/+1
2006-06-28Improved three-way blob merging codeLinus Torvalds1-0/+73
2006-06-28Prepare "git-merge-tree" for future workLinus Torvalds1-15/+119
2006-05-08Merge branch 'fix'Junio C Hamano1-1/+1
2006-05-08Separate object name errors from usage errorsDmitry V. Levin1-1/+1
2006-05-03sha1_to_hex() usage cleanupLinus Torvalds1-4/+2
2006-03-29tree/diff header cleanup.Junio C Hamano1-95/+1
2006-02-15git-merge-tree: generalize the "traverse <n> trees in sync" functionalityLinus Torvalds1-53/+67
2006-02-15Handling large files with GITLinus Torvalds1-10/+30
2006-02-15Handling large files with GITLinus Torvalds1-0/+238
2005-04-16Remove "merge-tree.c"Linus Torvalds1-145/+0
2005-04-15[PATCH] Add '-z' to merge-tree.cJunio C Hamano1-3/+20
2005-04-14Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds1-0/+128
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-19 02:47:47 +0000