| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Replace uses of strdup with xstrdup. | Shawn Pearce | 2006-09-02 |
| * | Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length. | David Rientjes | 2006-08-17 |
| * | Improved three-way blob merging code | Linus Torvalds | 2006-06-28 |
| * | Prepare "git-merge-tree" for future work | Linus Torvalds | 2006-06-28 |
| * | Merge branch 'fix' | Junio C Hamano | 2006-05-08 |
| |\ | |||
| | * | Separate object name errors from usage errors | Dmitry V. Levin | 2006-05-08 |
| * | | sha1_to_hex() usage cleanup | Linus Torvalds | 2006-05-03 |
| |/ | |||
| * | tree/diff header cleanup. | Junio C Hamano | 2006-03-29 |
| * | git-merge-tree: generalize the "traverse <n> trees in sync" functionality | Linus Torvalds | 2006-02-15 |
| * | Handling large files with GIT | Linus Torvalds | 2006-02-15 |
| * | Handling large files with GIT | Linus Torvalds | 2006-02-15 |
| * | Remove "merge-tree.c" | Linus Torvalds | 2005-04-16 |
| * | [PATCH] Add '-z' to merge-tree.c | Junio C Hamano | 2005-04-15 |
| * | Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. | Linus Torvalds | 2005-04-14 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/merge-tree.c