summaryrefslogtreecommitdiff
path: root/ll-merge.c
Commit message (Expand)AuthorAgeFilesLines
* parse_config_key(): return subsection len as size_tJeff King2020-04-101-1/+1
* am: reload .gitattributes after patching itbrian m. carlson2019-09-031-4/+15
* Merge branch 'en/merge-path-collision'Junio C Hamano2019-01-041-1/+3
|\
| * merge-recursive: increase marker length with depth of recursionElijah Newren2018-11-081-1/+3
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-8/+9
|\ \
| * | ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-8/+9
| |/
* | Make git_check_attr() a void functionTorsten Bögershausen2018-09-121-8/+8
|/
* attr: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-2/+2
* avoid "write_in_full(fd, buf, len) != len" patternJeff King2017-09-141-1/+1
* Merge branch 'ab/free-and-null'Junio C Hamano2017-06-241-2/+1
|\
| * coccinelle: make use of the "expression" FREE_AND_NULL() ruleÆvar Arnfjörð Bjarmason2017-06-161-2/+1
* | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \
| * | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| |/
* | convert: convert renormalize_buffer to take an indexBrandon Williams2017-06-131-1/+1
|/
* 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-091-2/+6
| * ll-merge: fix typo in commentJunio C Hamano2016-04-141-1/+3
* | use xmallocz to avoid size arithmeticJeff King2016-02-221-1/+1
* | Merge branch 'jk/war-on-sprintf'Junio C Hamano2015-10-201-6/+6
|\ \
| * | convert trivial sprintf / strcpy calls to xsnprintfJeff King2015-09-251-6/+6
* | | Sync with 2.4.10Junio C Hamano2015-09-281-1/+4
|\ \ \ | |/ / |/| |
| * | xdiff: reject files larger than ~1GBJeff King2015-09-281-1/+4
| |/
* | ll-merge: pass the original path to external driversjc/ll-merge-expose-pathJunio C Hamano2015-06-041-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-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
| |/
View Lorry Controller Status