summaryrefslogtreecommitdiff
path: root/merge-tree.c
AgeCommit message (Expand)AuthorFilesLines
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-4/+4
2006-09-14Handle invalid argc gentlyLibravatar Dmitry V. Levin1-1/+1
2006-09-13Make count-objects, describe and merge-tree work in subdirectoryLibravatar Dmitry V. Levin1-0/+2
2006-09-02Replace uses of strdup with xstrdup.Libravatar Shawn Pearce1-2/+2
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.Libravatar David Rientjes1-1/+1
2006-06-28Improved three-way blob merging codeLibravatar Linus Torvalds1-0/+73
2006-06-28Prepare "git-merge-tree" for future workLibravatar Linus Torvalds1-15/+119
2006-05-08Merge branch 'fix'Libravatar Junio C Hamano1-1/+1
2006-05-08Separate object name errors from usage errorsLibravatar Dmitry V. Levin1-1/+1
2006-05-03sha1_to_hex() usage cleanupLibravatar Linus Torvalds1-4/+2
2006-03-29tree/diff header cleanup.Libravatar Junio C Hamano1-95/+1
2006-02-15git-merge-tree: generalize the "traverse <n> trees in sync" functionalityLibravatar Linus Torvalds1-53/+67
2006-02-15Handling large files with GITLibravatar Linus Torvalds1-10/+30
2006-02-15Handling large files with GITLibravatar Linus Torvalds1-0/+238
2005-04-16Remove "merge-tree.c"Libravatar Linus Torvalds1-145/+0
2005-04-15[PATCH] Add '-z' to merge-tree.cLibravatar Junio C Hamano1-3/+20
2005-04-14Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Libravatar Linus Torvalds1-0/+128
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:56:16 +0000