summary refs log tree commit diff
path: root/ll-merge.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-18/+22
2021-06-11ll_union_merge(): rename path_unused parameterJeff King1-2/+2
2021-06-11ll_union_merge(): pass name labels to ll_xdl_merge()Jeff King1-1/+1
2021-06-11ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONJeff King1-1/+3
2021-03-13use CALLOC_ARRAYRené Scharfe1-1/+1
2020-04-10parse_config_key(): return subsection len as size_tJeff King1-1/+1
2019-09-03am: reload .gitattributes after patching itbrian m. carlson1-4/+15
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano1-1/+3
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren1-1/+3
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-8/+9
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-8/+9
2018-09-12Make git_check_attr() a void functionTorsten Bögershausen1-8/+8
2018-08-13attr: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+2
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King1-1/+1
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano1-2/+1
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-16coccinelle: make use of the "expression" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason1-2/+1
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13convert: convert renormalize_buffer to take an indexBrandon Williams1-1/+1
2017-02-01attr: convert git_check_attrs() callers to use the new APIJunio C Hamano1-19/+14
2017-02-01attr: rename function and struct related to checking attributesJunio C Hamano1-5/+5
2016-05-17Merge branch 'jc/ll-merge-internal'Junio C Hamano1-3/+9
2016-05-09ll-merge: use a longer conflict marker for internal mergeJunio C Hamano1-2/+6
2016-04-14ll-merge: fix typo in commentJunio C Hamano1-1/+3
2016-02-22use xmallocz to avoid size arithmeticJeff King1-1/+1
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano1-6/+6
2015-09-28Sync with 2.4.10Junio C Hamano1-1/+4
2015-09-28xdiff: reject files larger than ~1GBJeff King1-1/+4
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King1-6/+6
2015-06-04ll-merge: pass the original path to external driversJunio C Hamano1-2/+8
2014-08-13ll-merge.c: refactor `read_merge_config()` to use `git_config_string()`Tanay Abhra1-17/+6
2013-01-23convert some config callbacks to parse_config_keyJeff King1-9/+5
2012-09-14Merge branch 'jc/ll-merge-binary-ours'Junio C Hamano1-8/+24
2012-09-12ll-merge: warn about inability to merge binary files only when we can'tJunio C Hamano1-3/+4
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano1-5/+20
2012-04-30remove superfluous newlines in error messagesPete Wyckoff1-1/+1
2011-08-04Rename git_checkattr() to git_check_attr()Michael Haggerty1-2/+2
2011-01-15ll-merge: simplify opts == NULL caseJonathan Nieder1-6/+3
2010-08-26merge-recursive --patienceJustin Frankel1-0/+1
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder1-17/+33
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder1-3/+3
2010-08-06ll-merge: make flag easier to populateJonathan Nieder1-4/+5
2010-07-02Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen1-0/+15
2010-05-31Rewrite dynamic structure initializations to runtime assignmentGary V. Vaughan1-7/+7
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder1-9/+11
2010-03-20xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder1-1/+3
2010-03-02refactor merge flags into xmparam_tBert Wesarg1-8/+4
2010-03-02make union merge an xdl merge favorBert Wesarg1-38/+5
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano1-28/+53
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-12/+13
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-20 09:34:30 +0000