summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* merge-base: Remove redundant merge basesVicent Marti2015-11-021-22/+165
* merge: Do not mallocz unecessary entriesvmg/poolVicent Marti2015-10-281-2/+2
* pool: Dot not assume mallocs are zeroed outVicent Marti2015-10-281-4/+4
* pool: Simplify implementationVicent Marti2015-10-281-3/+3
* merge: Plug memory leakvmg/reuc-insertVicent Marti2015-10-271-3/+3
* merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-271-28/+43
* merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-221-1/+8
* diff: don't feed large files to xdiffEdward Thomson2015-10-051-1/+0
* merge_file: treat large files as binaryEdward Thomson2015-10-051-55/+0
* diff: drop `FILELIST_MATCH`Edward Thomson2015-08-301-1/+1
* diff: use new iterator pathlist handlingEdward Thomson2015-08-301-1/+2
* Move filelist into the iterator handling itself.Edward Thomson2015-08-281-3/+2
* iterator: use an options struct instead of argsEdward Thomson2015-08-281-11/+24
* Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-121-3/+3
* iterator: provide git_iterator_walkEdward Thomson2015-06-251-86/+30
* merge: actually increment the counts, not the pointersCarlos Martín Nieto2015-06-101-2/+2
* Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-291-1/+1
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-2/+2
* merge: merge iteratorsEdward Thomson2015-05-111-20/+66
* Merge pull request #2967 from jacquesg/merge-whitespaceEdward Thomson2015-03-181-6/+10
|\
| * Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-161-5/+5
| * Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
| * Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-161-4/+8
* | PERF: In MERGE, lazily compute is_binaryJeff Hostetler2015-03-161-8/+19
|/
* Merge pull request #2831 from ethomson/merge_lockCarlos Martín Nieto2015-02-151-11/+14
|\
View Lorry Controller Status