summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* git_error: use new names in internal APIs and usageEdward Thomson2019-01-221-37/+37
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-011-3/+3
* Merge pull request #4770 from tiennou/feature/merge-analysis-any-branchPatrick Steinhardt2018-11-301-10/+35
|\
| * merge: assert that we're passed sane parametersEtienne Samson2018-10-191-2/+2
| * merge: make analysis possible against a non-HEAD referenceEtienne Samson2018-10-191-8/+33
* | khash: remove intricate knowledge of khash typesPatrick Steinhardt2018-11-281-2/+2
* | Merge branch 'issue-4203'Edward Thomson2018-10-201-1/+6
|\ \ | |/ |/|
| * merge: don't leak the index during reloadsethomson/issue-4203Edward Thomson2018-10-201-3/+4
| * merge: add error handling for index reloadEtiene Dalcol2017-11-111-3/+4
| * merge: reload index before git_mergeGreg Collinge2017-11-111-0/+3
* | Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-7/+7
* | merge: virtual commit should be last argument to merge-baseethomson/recursiveTyrie Vella2018-02-041-2/+8
* | merge: reverse merge bases for recursive mergeEdward Thomson2018-02-041-7/+11
* | merge: recursive uses larger conflict markersEdward Thomson2018-01-211-0/+1
|/
* Make sure to always include "common.h" firstPatrick Steinhardt2017-07-031-2/+2
* merge: fix potential free of uninitialized memoryPatrick Steinhardt2017-06-211-1/+1
* merge: perform exact rename detection in linear timeMichael Tesch2017-05-171-31/+152
* Merge branch 'pr/3957'Edward Thomson2017-03-231-0/+20
|\
| * merge: indentation fixupEdward Thomson2017-03-231-1/+1
| * Perf: Don't perform merge operations for trivial merges.Arthur Schreiber2016-10-181-0/+20
* | repository: rename `path_repository` and `path_gitlink`Patrick Steinhardt2017-02-131-5/+5
* | merge: don't do rename detection on submodulesEdward Thomson2017-02-091-1/+1
* | Merge pull request #4061 from libgit2/ethomson/merge_optsCarlos Martín Nieto2017-01-141-4/+4
|\ \
| * | merge: set default rename thresholdEdward Thomson2017-01-011-4/+4
* | | giterr_set: consistent error messagesEdward Thomson2016-12-291-8/+8
|/ /
* | common: use PRIuZ for size_t in `giterr_set` callsPatrick Steinhardt2016-11-141-1/+1
|/
* git_diff_generated: abstract generated diffsEdward Thomson2016-05-261-0/+2
* Ignore submodules when checking for merge conflicts in the workdir.Jason Haslam2016-05-261-0/+1
* merge drivers: handle configured but not found driverEdward Thomson2016-03-171-4/+13
* merge driver: remove `check` callbackEdward Thomson2016-03-171-19/+18
* merge driver: correct global initializationEdward Thomson2016-03-171-0/+1
* merge driver: get a pointer to favorEdward Thomson2016-03-171-1/+1
* merge driver: correct indentationEdward Thomson2016-03-171-13/+13
* merge driver: allow custom default driverEdward Thomson2016-03-171-6/+34
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-78/+112
* Fix rebase bug and include test for merge=unionStan Hu2016-03-171-1/+1
* Support union merges via .gitattributes fileStan Hu2016-03-171-0/+26
* Horrible fix for #3173.Arthur Schreiber2016-02-111-7/+7
* merge: fix memory leakPatrick Steinhardt2016-02-081-3/+2
* merge: Use `git_index__fill` to populate the indexvmg/index-fillVicent Marti2015-12-161-5/+2
* recursive merge: add a recursion limitEdward Thomson2015-11-251-3/+10
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-251-19/+48
* merge: use annotated commits for recursionEdward Thomson2015-11-251-59/+83
* merge: merge annotated commits instead of regular commitsEdward Thomson2015-11-251-156/+125
* merge: octopus merge common ancestors when >2Edward Thomson2015-11-251-119/+165
* merge: compute octopus merge basesEdward Thomson2015-11-251-89/+100
* merge: build virtual base of multiple merge basesEdward Thomson2015-11-251-10/+123
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-6/+6
* merge-base: StyleVicent Marti2015-11-021-1/+6
* merge-base: Do not read parents from the rootVicent Marti2015-11-021-1/+1
View Lorry Controller Status