| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2009-06-20 | Merge branch 'maint-1.6.2' into maint |  Junio C Hamano | 1 | -4/+4 |
| 2009-06-20 | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 1 | -4/+4 |
| 2009-06-14 | use xstrdup, not strdup in ll-merge.c |  Jim Meyering | 1 | -4/+4 |
| 2009-04-29 | replace direct calls to unlink(2) with unlink_or_warn |  Alex Riesen | 1 | -1/+1 |
| 2008-11-23 | merge-recursive: use strbuf_expand() instead of interpolate() |  René Scharfe | 1 | -12/+9 |
| 2008-08-30 | git-merge-recursive: learn to honor merge.conflictstyle | Junio C Hamano | 1 | -5/+13 |
| 2008-05-14 | Provide git_config with a callback-data parameter |  Johannes Schindelin | 1 | -2/+2 |
| 2008-02-18 | merge-recursive: split low-level merge functions out. | Junio C Hamano | 1 | -0/+379 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/ll-merge.c