summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)Author
2016-02-22use xmallocz to avoid size arithmeticJeff King
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano
2015-09-28Sync with 2.4.10Junio C Hamano
2015-09-28xdiff: reject files larger than ~1GBJeff King
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King
2015-06-04ll-merge: pass the original path to external driversJunio C Hamano
2014-08-13ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`Tanay Abhra
2013-01-23convert some config callbacks to parse_config_keyJeff King
2012-09-15Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano
2012-09-09merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano
2012-04-30remove superfluous newlines in error messagesPete Wyckoff
2011-08-04Rename git_checkattr() to git_check_attr()Michael Haggerty
2011-01-16ll-merge: simplify opts == NULL caseJonathan Nieder
2010-08-26merge-recursive --patienceJustin Frankel
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder
2010-08-06ll-merge: make flag easier to populateJonathan Nieder
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen
2010-05-31Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
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