23 Commits (179c94b24ae87e28328f9b311489417b66bd62c9)

Author SHA1 Message Date
Linus Torvalds 91e4f03604 Make 'traverse_trees()' traverse conflicting DF entries in parallel 17 years ago
Linus Torvalds 5803c6f8a2 Add return value to 'traverse_tree()' callback 17 years ago
Linus Torvalds 40d934df72 Make 'traverse_tree()' use linked structure rather than 'const char *base' 17 years ago
Junio C Hamano c279d7e986 xdl_diff: identify call sites. 17 years ago
Johannes Schindelin 30b250104d Future-proof source for changes in xdemitconf_t 18 years ago
Linus Torvalds a8c40471ab Remove "pathlen" from "struct name_entry" 18 years ago
Nicolas Pitre 21666f1aae convert object type handling from a string to a number 18 years ago
Dmitry V. Levin 5b6df8e45f Handle invalid argc gently 18 years ago
Dmitry V. Levin 8112894d82 Make count-objects, describe and merge-tree work in subdirectory 18 years ago
Shawn Pearce 9befac470b Replace uses of strdup with xstrdup. 18 years ago
David Rientjes a89fccd281 Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. 18 years ago
Linus Torvalds 0c7993839b Improved three-way blob merging code 19 years ago
Linus Torvalds 83788070a3 Prepare "git-merge-tree" for future work 19 years ago
Dmitry V. Levin 31fff305bc Separate object name errors from usage errors 19 years ago
Linus Torvalds dcb3450fd8 sha1_to_hex() usage cleanup 19 years ago
Junio C Hamano 1b0c7174a1 tree/diff header cleanup. 19 years ago
Linus Torvalds 164dcb97f0 git-merge-tree: generalize the "traverse <n> trees in sync" functionality 19 years ago
Linus Torvalds 01df529722 Handling large files with GIT 19 years ago
Linus Torvalds 492e0759bf Handling large files with GIT 19 years ago
Linus Torvalds 2fbdd13174 Remove "merge-tree.c" 20 years ago
Junio C Hamano d07f651c25 [PATCH] Add '-z' to merge-tree.c 20 years ago
Linus Torvalds 33deb63a36 Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. 20 years ago