summaryrefslogtreecommitdiff
path: root/ll-merge.c
Commit message (Expand)AuthorAgeFilesLines
* xdiff: reject files larger than ~1GBJeff King2015-09-281-1/+4
* ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`Tanay Abhra2014-08-131-17/+6
* convert some config callbacks to parse_config_keyJeff King2013-01-231-9/+5
* Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano2012-09-141-8/+24
|\
| * ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano2012-09-121-3/+4
| * merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-081-5/+20
* | remove superfluous newlines in error messagesPete Wyckoff2012-04-301-1/+1
|/
* Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-041-2/+2
* ll-merge: simplify opts == NULL caseJonathan Nieder2011-01-151-6/+3
* merge-recursive --patienceJustin Frankel2010-08-261-0/+1
* ll-merge: replace flag argument with options structJonathan Nieder2010-08-261-17/+33
* ll-merge: let caller decide whether to renormalizeJonathan Nieder2010-08-061-3/+3
* ll-merge: make flag easier to populateJonathan Nieder2010-08-061-4/+5
* Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen2010-07-021-0/+15
* Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-05-311-7/+7
* ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-9/+11
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-201-1/+3
* refactor merge flags into xmparam_tBert Wesarg2010-03-021-8/+4
* make union merge an xdl merge favorBert Wesarg2010-03-021-38/+5
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-201-28/+53
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-171-0/+15
| * conflict-marker-size: new attributeJunio C Hamano2010-01-161-25/+34
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-161-3/+3
| * git_attr(): fix function signatureJunio C Hamano2010-01-161-1/+1
* | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-12/+13
|\ \
| * | git merge -X<option>Avery Pennarun2010-01-171-12/+13
| |/
* | run-command: convert simple callsites to use_shellJeff King2010-01-051-3/+3
|/
* Merge branch 'js/run-command-updates'Junio C Hamano2009-08-101-4/+0
|\
| * run_command: return exit code as positive valueJohannes Sixt2009-07-051-4/+0
* | Merge branch 'tr/die_errno'Junio C Hamano2009-07-061-1/+1
|\ \ | |/ |/|
| * Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-271-1/+1
* | Remove filename from conflict markersMartin Renold2009-07-011-4/+4
* | Merge branch 'sb/maint-1.6.0-add-config-fix'Junio C Hamano2009-06-201-4/+4
|\ \
| * | use xstrdup, not strdup in ll-merge.cJim Meyering2009-06-141-4/+4
* | | Simplify some instances of run_command() by using run_command_v_opt().Johannes Sixt2009-06-091-9/+2
| |/ |/|
* | replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-291-1/+1
* | merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-231-12/+9
* | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-301-5/+13
|/
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-2/+2
* merge-recursive: split low-level merge functions out.Junio C Hamano2008-02-181-0/+379
View Lorry Controller Status