Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/ll-merge.c
AgeCommit message (Expand)Author
2020-04-11parse_config_key(): return subsection len as size_tJeff King
2019-09-04am: reload .gitattributes after patching itbrian m. carlson
2019-01-05Merge 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-13Make git_check_attr() a void functionTorsten Bögershausen
2018-08-14attr: 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-25Merge branch 'ab/free-and-null'Junio C Hamano
2017-06-25Merge 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-02attr: convert git_check_attrs() callers to use the new APIJunio C Hamano
2017-02-02attr: rename function and struct related to checking attributesJunio C Hamano
2016-05-18Merge branch 'jc/ll-merge-internal'Junio C Hamano
2016-05-10ll-merge: use a longer conflict marker for internal mergeJunio C Hamano
2016-04-15ll-merge: fix typo in commentJunio C Hamano
2016-02-23use xmallocz to avoid size arithmeticJeff King
2015-10-21Merge branch 'jk/war-on-sprintf'Junio C Hamano
2015-09-29Sync with 2.4.10Junio C Hamano
2015-09-29xdiff: reject files larger than ~1GBJeff King
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King
2015-06-05ll-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-05-01remove superfluous newlines in error messagesPete Wyckoff
2011-08-05Rename 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-03Avoid conflicts when merging branches with mixed normalizationEyvind Bernhardsen
2010-06-01Rewrite 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 12:16:15 +0300