summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)Author
2023-01-14attr: add flag `--source` to work with tree-ishKarthik Nayak
2022-11-08Merge branch 'rs/no-more-run-command-v'Taylor Blau
2022-10-30use child_process member "args" instead of string array variableRené Scharfe
2022-10-18ll-merge: mark unused parameters in callbacksJeff King
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason
2022-08-19config: mark unused callback parametersJeff King
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren
2021-06-11ll_union_merge(): rename path_unused parameterJeff King
2021-06-11ll_union_merge(): pass name labels to ll_xdl_merge()Jeff King
2021-06-11ll_binary_merge(): handle XDL_MERGE_FAVOR_UNIONJeff King
2021-03-14use CALLOC_ARRAYRené Scharfe
2020-04-10parse_config_key(): return subsection len as size_tJeff King
2019-09-03am: reload .gitattributes after patching itbrian m. carlson
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-12Make git_check_attr() a void functionTorsten Bögershausen
2018-08-13attr: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy
2017-09-14avoid "write_in_full(fd, buf, len) != len" patternJeff King
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-16coccinelle: make use of the "expression" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13convert: convert renormalize_buffer to take an indexBrandon Williams
2017-02-01attr: convert git_check_attrs() callers to use the new APIJunio C Hamano
2017-02-01attr: rename function and struct related to checking attributesJunio C Hamano
2016-05-17Merge branch 'jc/ll-merge-internal'Junio C Hamano
2016-05-09ll-merge: use a longer conflict marker for internal mergeJunio C Hamano
2016-04-14ll-merge: fix typo in commentJunio C Hamano
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