| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-06-21 | 1 | -4/+4 |
| |\ | |||||
| | * | use xstrdup, not strdup in ll-merge.c | Jim Meyering | 2009-06-14 | 1 | -4/+4 |
| * | | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe | 2008-11-24 | 1 | -12/+9 |
| * | | git-merge-recursive: learn to honor merge.conflictstyle | Junio C Hamano | 2008-08-31 | 1 | -5/+13 |
| |/ | |||||
| * | Provide git_config with a callback-data parameter | Johannes Schindelin | 2008-05-14 | 1 | -2/+2 |
| * | merge-recursive: split low-level merge functions out. | Junio C Hamano | 2008-02-18 | 1 | -0/+379 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |