summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)Author
2010-03-02refactor merge flags into xmparam_tBert Wesarg
2010-03-02make union merge an xdl merge favorBert Wesarg
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano
2010-01-17conflict-marker-size: new attributeJunio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2010-01-17git_attr(): fix function signatureJunio C Hamano
2010-01-06run-command: convert simple callsites to use_shellJeff King
2009-08-11Merge branch 'js/run-command-updates'Junio C Hamano
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano
2009-07-05run_command: return exit code as positive valueJohannes Sixt
2009-07-02Remove filename from conflict markersMartin Renold
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast
2009-06-21Merge branch 'sb/maint-1.6.0-add-config-fix'Junio C Hamano
2009-06-14use xstrdup, not strdup in ll-merge.cJim Meyering
2009-06-09Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt
2009-04-30replace direct calls to unlink(2) with unlink_or_warnAlex Riesen
2008-11-24merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe
2008-08-31git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-02-18merge-recursive: split low-level merge functions out.Junio C Hamano