summaryrefslogtreecommitdiffstats
path: root/ll-merge.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* attr: convert git_check_attrs() callers to use the new APIJunio C Hamano2017-02-011-19/+14
* attr: rename function and struct related to checking attributesJunio C Hamano2017-02-011-5/+5
* Merge branch 'jc/ll-merge-internal'Junio C Hamano2016-05-171-3/+9
|\
| * ll-merge: use a longer conflict marker for internal mergeJunio C Hamano2016-05-101-2/+6
| * ll-merge: fix typo in commentJunio C Hamano2016-04-151-1/+3
* | use xmallocz to avoid size arithmeticJeff King2016-02-221-1/+1
* | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-211-6/+6
|\ \
| * | convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-251-6/+6
* | | Sync with 2.4.10Junio C Hamano2015-09-291-1/+4
|\ \ \ | |/ / |/| |
| * | xdiff: reject files larger than ~1GBJeff King2015-09-281-1/+4
| |/
* / ll-merge: pass the original path to external driversJunio C Hamano2015-06-051-2/+8
|/
* 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-151-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-091-5/+20
* | remove superfluous newlines in error messagesPete Wyckoff2012-05-011-1/+1
|/
* Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-051-2/+2
* ll-merge: simplify opts == NULL caseJonathan Nieder2011-01-161-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-031-0/+15
* Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan2010-06-011-7/+7
* ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-211-9/+11
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-211-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-211-28/+53
|\
| * rerere: honor conflict-marker-size attributeJunio C Hamano2010-01-171-0/+15
| * conflict-marker-size: new attributeJunio C Hamano2010-01-171-25/+34
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-171-3/+3
| * git_attr(): fix function signatureJunio C Hamano2010-01-171-1/+1
* | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-211-12/+13
|\ \
| * | git merge -X<option>Avery Pennarun2010-01-181-12/+13
| |/
* / run-command: convert simple callsites to use_shellJeff King2010-01-061-3/+3
|/
* Merge branch 'js/run-command-updates'Junio C Hamano2009-08-111-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-021-4/+4
* | Merge branch 'sb/maint-1.6.0-add-config-fix'Junio C Hamano2009-06-211-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-301-1/+1
* | merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-241-12/+9
* | git-merge-recursive: learn to honor merge.conflictstyleJunio C Hamano2008-08-311-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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 19:32:19 +0100