aboutsummaryrefslogtreecommitdiff
path: root/merge-tree.c
Commit message (Expand)AuthorAge
* Improved three-way blob merging codeLinus Torvalds2006-06-28
* Prepare "git-merge-tree" for future workLinus Torvalds2006-06-28
* Merge branch 'fix'Junio C Hamano2006-05-08
|\
| * Separate object name errors from usage errorsDmitry V. Levin2006-05-08
* | sha1_to_hex() usage cleanupLinus Torvalds2006-05-03
|/
* tree/diff header cleanup.Junio C Hamano2006-03-29
* git-merge-tree: generalize the "traverse <n> trees in sync" functionalityLinus Torvalds2006-02-15
* Handling large files with GITLinus Torvalds2006-02-15
* Handling large files with GITLinus Torvalds2006-02-15
* Remove "merge-tree.c"Linus Torvalds2005-04-16
* [PATCH] Add '-z' to merge-tree.cJunio C Hamano2005-04-15
* Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.Linus Torvalds2005-04-14