| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-tree: fix d/f conflicts | Junio C Hamano | 2012-12-26 | 1 | -32/+40 |
| * | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 2012-12-26 | 1 | -4/+22 |
| * | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 2012-12-26 | 1 | -3/+0 |
| * | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 2012-12-26 | 1 | -2/+1 |
| * | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 | 1 | -2/+2 |
| * | sparse: Fix an "symbol 'merge_file' not decared" warning | Ramsay Jones | 2011-04-11 | 1 | -2/+1 |
| * | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 1 | -1/+1 |
| * | merge-tree: fix where two branches share no changes | Will Palmer | 2010-07-14 | 1 | -1/+2 |
| * | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
| * | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 2010-02-22 | 1 | -0/+358 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |