summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
Commit message (Expand)AuthorAgeFilesLines
* merge driver: allow custom default driverEdward Thomson2016-03-171-1/+10
* Better document `git_merge_commits` reduxEdward Thomson2016-02-081-8/+0
* recursive merge: add a recursion limitEdward Thomson2015-11-251-0/+8
* merge: add simple recursive testEdward Thomson2015-11-251-4/+12
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-251-17/+19
* merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti2015-10-271-0/+5
* merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-221-0/+7
* Update documentation for API changesjamill/doc_updateJameson Miller2015-04-301-1/+2
* Added options to enable patience and minimal diff driversJacques Germishuys2015-03-161-0/+6
* Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-161-23/+11
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-161-2/+2
* Allow for merges with whitespace discrepanciesJacques Germishuys2015-03-161-0/+23
* Better document `git_merge_commits`Edward Thomson2015-01-051-0/+8
* doc: add documentation to all the public structs and enumscmn/doc-allCarlos Martín Nieto2014-12-061-5/+20
* merge: talk about the merging state after git_merge()Carlos Martín Nieto2014-11-021-0/+5
* s/git_merge_head/git_annotated_commitEdward Thomson2014-10-261-65/+3
* Add git_merge_bases_many.Arthur Schreiber2014-10-091-0/+15
* merge: expose multiple merge basescmn/oidarrayCarlos Martín Nieto2014-07-271-0/+16
* Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson2014-05-271-6/+7
* Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson2014-05-271-3/+11
* Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson2014-05-271-0/+12
* Fixed miscellaneous documentation errors.Michael Anderson2014-05-231-5/+5
* Doc fixesRussell Belfer2014-05-021-2/+2
* Make init_options fns use unsigned ints and macroRussell Belfer2014-05-021-3/+3
* Const correctness!Jacques Germishuys2014-04-031-1/+1
* Const up members of git_merge_file_resultEdward Thomson2014-03-311-2/+2
* Introduce git_merge_head_idEdward Thomson2014-03-311-0/+9
* UNBORN implies FAST_FORWARDEdward Thomson2014-03-201-2/+2
* Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-201-0/+7
* git_merge_status -> git_merge_analysisEdward Thomson2014-03-201-10/+13
* Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-201-60/+4
* Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-201-13/+13
* Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-201-28/+4
* Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-201-27/+1
* Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-201-0/+40
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-0/+169
* Implement git_merge_base_octopusAimeast2014-03-181-1/+16
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-2/+2
* Revert pull request #1997revert-1997Vicent Marti2014-03-061-1/+1
* Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti2014-03-061-1/+1
|\
| * Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
* | Added function-based initializers for every options struct.Matthew Bowen2014-03-051-0/+24
* | Improve documentation for mergingEdward Thomson2014-02-211-33/+127
* | merge: rename _oid() -> id()Carlos Martín Nieto2014-01-251-4/+4
* | Support union mergesEdward Thomson2014-01-201-0/+3
* | Remove the "merge none" flagEdward Thomson2014-01-201-5/+2
* | merge_file should use more aggressive levelsEdward Thomson2014-01-201-7/+14
|/
* Bare naked merge and rebaseEdward Thomson2013-12-031-0/+20
* merge branch into current, updating workdirEdward Thomson2013-11-051-0/+60
* merge: reverse array and length parameter orderCarlos Martín Nieto2013-09-221-3/+3
View Lorry Controller Status