| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 | 1 | -1/+1 |
| * | | Remove filename from conflict markers | Martin Renold | 2009-07-01 | 1 | -4/+4 |
| * | | Merge branch 'sb/maint-1.6.0-add-config-fix' | Junio C Hamano | 2009-06-20 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | use xstrdup, not strdup in ll-merge.c | Jim Meyering | 2009-06-14 | 1 | -4/+4 |
| * | | | Simplify some instances of run_command() by using run_command_v_opt(). | Johannes Sixt | 2009-06-09 | 1 | -9/+2 |
| | |/ |/| | |||||
| * | | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 | 1 | -1/+1 |
| * | | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe | 2008-11-23 | 1 | -12/+9 |
| * | | git-merge-recursive: learn to honor merge.conflictstyle | Junio C Hamano | 2008-08-30 | 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 : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/ll-merge.c