| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2013-04-08 | merge-tree: don't print entries that match "local" |  John Keeping | 1 | -13/+13 |
| 2013-03-27 | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 1 | -1/+1 |
| 2012-12-26 | merge-tree: fix d/f conflicts |  Junio C Hamano | 1 | -32/+40 |
| 2012-12-26 | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 1 | -4/+22 |
| 2012-12-26 | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 1 | -3/+0 |
| 2012-12-26 | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 1 | -2/+1 |
| 2012-12-09 | Which merge_file() function do you mean? | Junio C Hamano | 1 | -2/+2 |
| 2011-04-11 | sparse: Fix an "symbol 'merge_file' not decared" warning |  Ramsay Jones | 1 | -2/+1 |
| 2011-03-22 | Fix sparse warnings |  Stephen Boyd | 1 | -1/+1 |
| 2010-07-14 | merge-tree: fix where two branches share no changes |  Will Palmer | 1 | -1/+2 |
| 2010-06-21 | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 1 | -1/+1 |
| 2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory |  Linus Torvalds | 1 | -0/+358 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |