Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/include/git2/merge.h
AgeCommit message (Expand)Author
2018-10-19merge: make analysis possible against a non-HEAD referenceEtienne Samson
2018-05-07docs: standardize comment block for git_*_init_options functionsEtienne Samson
2018-01-21merge: allow custom conflict marker sizeEdward Thomson
2017-01-02merge: set default rename thresholdEdward Thomson
2016-03-17merge driver: allow custom default driverEdward Thomson
2016-02-09Better document `git_merge_commits` reduxEdward Thomson
2015-11-26recursive merge: add a recursion limitEdward Thomson
2015-11-25merge: add simple recursive testEdward Thomson
2015-11-25merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson
2015-10-28merge: Implement `GIT_MERGE_TREE_SKIP_REUC`Vicent Marti
2015-10-22merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson
2015-04-30Update documentation for API changesJameson Miller
2015-03-16Added options to enable patience and minimal diff driversJacques Germishuys
2015-03-16Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys
2015-03-16Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys
2015-03-16Allow for merges with whitespace discrepanciesJacques Germishuys
2015-01-05Better document `git_merge_commits`Edward Thomson
2014-12-06doc: add documentation to all the public structs and enumsCarlos Martín Nieto
2014-11-02merge: talk about the merging state after git_merge()Carlos Martín Nieto
2014-10-27s/git_merge_head/git_annotated_commitEdward Thomson
2014-10-09Add git_merge_bases_many.Arthur Schreiber
2014-07-27merge: expose multiple merge basesCarlos Martín Nieto
2014-05-28Modify GIT_MERGE_CONFIG -> GIT_MERGE_PREFERENCEEdward Thomson
2014-05-28Move GIT_MERGE_CONFIG_* to its own enumEdward Thomson
2014-05-28Introduce GIT_MERGE_CONFIG_* for merge.ff settingsEdward Thomson
2014-05-23Fixed miscellaneous documentation errors.Michael Anderson
2014-05-03Doc fixesRussell Belfer
2014-05-02Make init_options fns use unsigned ints and macroRussell Belfer
2014-04-03Const correctness!Jacques Germishuys
2014-03-31Const up members of git_merge_file_resultEdward Thomson
2014-03-31Introduce git_merge_head_idEdward Thomson
2014-03-20UNBORN implies FAST_FORWARDEdward Thomson
2014-03-20Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson
2014-03-20git_merge_status -> git_merge_analysisEdward Thomson
2014-03-20Remove `git_merge_result` as it's now unnecessaryEdward Thomson
2014-03-20Update git_merge_tree_opts to git_merge_optionsEdward Thomson
2014-03-20Change signature of `git_merge` to take merge and checkout optsEdward Thomson
2014-03-20Remove fastforward / uptodate from `git_merge`Edward Thomson
2014-03-20Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson
2014-03-20Introduce git_merge_file for consumersEdward Thomson
2014-03-18Implement git_merge_base_octopusAimeast
2014-03-06git_checkout_opts -> git_checkout_optionsBen Straub
2014-03-06Revert pull request #1997revert-1997Vicent Marti
2014-03-06Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti
2014-03-06Added function-based initializers for every options struct.Matthew Bowen
2014-02-21Improve documentation for mergingEdward Thomson
2014-01-25merge: rename _oid() -> id()Carlos Martín Nieto
2014-01-21Support union mergesEdward Thomson
2014-01-21Remove the "merge none" flagEdward Thomson
2014-01-21merge_file should use more aggressive levelsEdward Thomson
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 02:42:51 +0300