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/src/merge.c
AgeCommit message (Expand)Author
2014-04-03Const correctness!Jacques Germishuys
2014-03-31Introduce git_merge_head_idEdward Thomson
2014-03-26Free temporary merge indexEdward Thomson
2014-03-24Merge pull request #2183 from ethomson/merge_refactorVicent Marti
2014-03-20revwalk: don't try to find merge bases when there can be noneCarlos Martín Nieto
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-06Added function-based initializers for every options struct.Matthew Bowen
2014-02-21Address PR commentsRussell Belfer
2014-02-07Merge pull request #2100 from libgit2/rb/update-pqueueVicent Marti
2014-02-04Replace pqueue with code from hashsig heapRussell Belfer
2014-02-04Remove unused pointer assignmentEdward Thomson
2014-02-04Merge wd validation tests against index not HEADEdward Thomson
2014-01-30Two-phase index mergingEdward Thomson
2014-01-25merge: rename _oid() -> id()Carlos Martín Nieto
2014-01-25diff: rename the file's 'oid' to 'id'Carlos Martín Nieto
2014-01-25index: rename an entry's id to 'id'Carlos Martín Nieto
2014-01-21Merge submodulesEdward Thomson
2014-01-21Remove the "merge none" flagEdward Thomson
2014-01-21Introduce diff3 mode for checking out conflictsEdward Thomson
2014-01-21Don't try to merge binary filesEdward Thomson
2014-01-21merge_file should use more aggressive levelsEdward Thomson
2013-12-13Merge pull request #1986 from libgit2/rb/error-handling-cleanupsVicent Marti
2013-12-13Validate struct versions in merge, revertEdward Thomson
2013-12-13Cleanups, renames, and leak fixesRussell Belfer
2013-12-11One more rename/cleanup for callback err functionsRussell Belfer
2013-12-11Some callback error check style cleanupsRussell Belfer
2013-12-11Remove converting user error to GIT_EUSERRussell Belfer
2013-12-11Add git_vector_free_allRussell Belfer
2013-12-11Further EUSER and error propagation fixesRussell Belfer
2013-12-11Add config read fns with controlled error behaviorRussell Belfer
2013-12-09Clean up warningsEdward Thomson
2013-12-03Bare naked merge and rebaseEdward Thomson
2013-12-03clean up state metadata more consistentlyEdward Thomson
2013-12-03Introduce git_revert to revert a single commitEdward Thomson
2013-11-13Fix warningsRussell Belfer
2013-11-05Plug git_merge() related leaksnulltoken
2013-11-05merge branch into current, updating workdirEdward Thomson
2013-11-05move mode_t to filebuf_open instead of _commitEdward Thomson
2013-10-30merge: any non-zero return from the user is an errorCarlos Martín Nieto
2013-09-22merge: reverse array and length parameter orderCarlos Martín Nieto
2013-07-15Fix some more memory leaks in error pathRémi Duraffort
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 04:00:09 +0300