summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* Introduce git_merge__extract_conflict_pathsJacques Germishuys2014-04-141-0/+41
* Const correctness!Jacques Germishuys2014-04-031-1/+1
* Introduce git_merge_head_idEdward Thomson2014-03-311-0/+8
* Free temporary merge indexEdward Thomson2014-03-261-2/+1
* Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-241-205/+195
|\
| * UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-1/+1
| * Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-10/+25
| * git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-5/+5
| * Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-47/+1
| * Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-24/+24
| * Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-38/+26
| * Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-82/+23
| * Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-9/+74
| * Introduce git_merge_file for consumersEdward Thomson2014-03-201-14/+41
* | revwalk: don't try to find merge bases when there can be noneCarlos Martín Nieto2014-03-201-0/+6
|/
* Implement git_merge_base_octopusAimeast2014-03-181-0/+25
* Added function-based initializers for every options struct.Matthew Bowen2014-03-051-0/+24
* Address PR commentsRussell Belfer2014-02-201-1/+1
* Merge pull request #2100 from libgit2/rb/update-pqueueVicent Marti2014-02-071-7/+8
|\
| * Replace pqueue with code from hashsig heapRussell Belfer2014-02-031-7/+8
* | Remove unused pointer assignmentEdward Thomson2014-02-031-1/+1
* | Merge wd validation tests against index not HEADEdward Thomson2014-02-031-6/+3
|/
* Two-phase index mergingEdward Thomson2014-01-291-5/+14
* merge: rename _oid() -> id()Carlos Martín Nieto2014-01-251-3/+3
* diff: rename the file's 'oid' to 'id'Carlos Martín Nieto2014-01-251-1/+1
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-13/+13
* Merge submodulesEdward Thomson2014-01-201-4/+10
* Remove the "merge none" flagEdward Thomson2014-01-201-11/+6
* Introduce diff3 mode for checking out conflictsEdward Thomson2014-01-201-5/+19
* Don't try to merge binary filesEdward Thomson2014-01-201-0/+43
* merge_file should use more aggressive levelsEdward Thomson2014-01-201-7/+10
* Merge pull request #1986 from libgit2/rb/error-handling-cleanupsVicent Marti2013-12-131-19/+11
|\
| * Cleanups, renames, and leak fixesRussell Belfer2013-12-121-1/+1
| * One more rename/cleanup for callback err functionsRussell Belfer2013-12-111-1/+1
| * Some callback error check style cleanupsRussell Belfer2013-12-111-1/+3
View Lorry Controller Status