| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Improved three-way blob merging code | Linus Torvalds | 2006-06-28 | 1 | -0/+73 |
| * | Prepare "git-merge-tree" for future work | Linus Torvalds | 2006-06-28 | 1 | -15/+119 |
| * | Merge branch 'fix' | Junio C Hamano | 2006-05-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Separate object name errors from usage errors | Dmitry V. Levin | 2006-05-08 | 1 | -1/+1 |
| * | | sha1_to_hex() usage cleanup | Linus Torvalds | 2006-05-03 | 1 | -4/+2 |
| |/ | |||||
| * | tree/diff header cleanup. | Junio C Hamano | 2006-03-29 | 1 | -95/+1 |
| * | git-merge-tree: generalize the "traverse <n> trees in sync" functionality | Linus Torvalds | 2006-02-15 | 1 | -53/+67 |
| * | Handling large files with GIT | Linus Torvalds | 2006-02-15 | 1 | -10/+30 |
| * | Handling large files with GIT | Linus Torvalds | 2006-02-15 | 1 | -0/+238 |
| * | Remove "merge-tree.c" | Linus Torvalds | 2005-04-16 | 1 | -145/+0 |
| * | [PATCH] Add '-z' to merge-tree.c | Junio C Hamano | 2005-04-15 | 1 | -3/+20 |
| * | Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. | Linus Torvalds | 2005-04-14 | 1 | -0/+128 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/merge-tree.c