summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * indexwriter: an indexwriter for repo operationsEdward Thomson2015-02-141-24/+10
| * merge: lock the index at the start of the mergeEdward Thomson2015-02-141-2/+19
* | Make our overflow check look more like gcc/clang'sEdward Thomson2015-02-131-5/+4
* | allocations: test for overflow of requested sizeEdward Thomson2015-02-121-0/+2
|/
* Merge branch 'pr/2740'Edward Thomson2015-01-141-7/+1
|\
| * Always use GIT_HASHSIG_SMART_WHITESPACE when diffing for mergesPierre-Olivier Latour2015-01-141-7/+1
* | Plug some leaksJacques Germishuys2014-12-291-1/+3
|/
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-147/+39
* Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-261-24/+1
* Extract shared functionality.Arthur Schreiber2014-10-091-55/+41
* Add git_merge_bases_many.Arthur Schreiber2014-10-091-0/+67
* hashsig: Export as a `sys` headervmg/hashsigVicent Marti2014-10-011-1/+1
* Remove local unused index_repo variableJacques Germishuys2014-09-121-3/+1
* Only check for workdir conflicts if the index has merged filesJacques Germishuys2014-09-121-0/+10
* Merge pull request #2481 from libgit2/cmn/oidarrayVicent Marti2014-08-291-1/+53
|\
| * merge: expose multiple merge basescmn/oidarrayCarlos Martín Nieto2014-07-271-1/+53
* | merge base: Correctly raise an error if a non-commit object is passed.Arthur Schreiber2014-08-251-1/+4
* | Don't allow conflicts by defaultEdward Thomson2014-07-171-2/+1
|/
* merge: don't open COMMIT_MSG unless we need to append conflictsEdward Thomson2014-07-081-3/+4
* git_checkout_index: checkout other indexesEdward Thomson2014-07-011-137/+36
* Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-271-7/+7
* Staticify `merge_config`Edward Thomson2014-05-271-1/+1
* Use a config snapshotEdward Thomson2014-05-271-1/+1
* Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-271-9/+12
* Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-271-9/+43
* Make init_options fns use unsigned ints and macroRussell Belfer2014-05-021-27/+13
* merge: checkout default shouldn't clobber givenEdward Thomson2014-04-231-5/+3
* merge: default checkout strategy for should be SAFEEdward Thomson2014-04-231-1/+1
* Index locking and entry allocation changesRussell Belfer2014-04-171-5/+5
* Decouple index iterator sort from indexRussell Belfer2014-04-171-1/+1
* Some vector utility tweaksRussell Belfer2014-04-171-2/+4
* Capture conflict information in MERGE_MSG for revert and mergeJacques Germishuys2014-04-141-0/+1
View Lorry Controller Status