summaryrefslogtreecommitdiff
path: root/merge.go
AgeCommit message (Expand)Author
2021-09-05Make all Options objects consistentlhchavez
2021-09-05Make all non-user-creatable structures non-comparable (#802)lhchavez
2020-12-13Support more MergeBase functions (#720)lhchavez
2020-12-10More callback refactoring (#713)lhchavez
2020-12-05Refactor all callbacks (#700)lhchavez
2020-12-05Mark some symbols to be deprecated #minor (#698)lhchavez
2020-10-22refactor: Use undeprecated options init (#656)Suhaib Mujahid
2020-09-18merge: Expose recursion limit merge option (#642)Patrick Steinhardt
2020-06-04Provide missing merge flags (#615)Takuji Shimokawa
2020-02-23Add test and runtime.KeepAlive()lhchavez
2020-02-23Merge remote-tracking branch 'upstream/master' into more-annotated-commitlhchavez
2019-12-10Adjust to libgit2 changesCarlos Martín Nieto
2019-01-02Merge pull request #425 from josharian/more-merge-file-flagsCarlos Martín Nieto
2018-02-22merge: expose the conflict marker size optionCarlos Martín Nieto
2018-01-25merge: add missing MergeFileFlag constantsJosh Bleecher Snyder
2018-01-25merge: add two missing AnnotatedCommit methodsJosh Bleecher Snyder
2017-07-08Third round of keep-alive aditionsCarlos Martín Nieto
2016-02-18Merge branch 'master' into nextCarlos Martín Nieto
2016-02-17Upgrade to libgit2 to 0f9d15493d5d8ad4353dd7beed52c9567334f6e5Han-Wen Nienhuys
2016-02-16merge: remove whitespace changeIan Lance Taylor
2016-02-16handles, merge: simplify code, don't copy file contentsIan Lance Taylor
2016-02-15Merge remote-tracking branch 'upstream/master' into nextCarlos Martín Nieto
2016-01-07handles, merge, odb: changes for Go 1.6 pointer passing rulesIan Lance Taylor
2015-10-26Mention that MergeAnalysis is a bitmaskCarlos Martín Nieto
2015-10-26Update libgit2 to 821131fCalin Seciu
2015-09-18Merge remote-tracking branch 'origin/master' into nextCarlos Martín Nieto
2015-08-31Run go fmtCarlos Martín Nieto
2015-08-31Merge branch 'next'Carlos Martín Nieto
2015-08-12merge: fix memory leak related to merge file optsPatrick Steinhardt
2015-08-04Merge remote-tracking branch 'origin/master' into nextCarlos Martín Nieto
2015-07-31Wrap MergeBasesCarlos Martín Nieto
2015-04-18Update to libgit2 4c02d3937Carlos Martín Nieto
2015-01-29Add TargetDirectory field to Checkout options.joseferminj
2014-12-11Remove useless includesCarlos Martín Nieto
2014-12-06Add missing thread lockingCarlos Martín Nieto
2014-12-03Update to masterCarlos Martín Nieto
2014-11-08Fix MergeTrees func to accept nil as ancestor parameterjoseferminj
2014-10-28Make the constants have typesCarlos Martín Nieto
2014-05-31Merge: merge analysis now returns the user's preferenceCarlos Martín Nieto
2014-04-04use cast_ptr instead of ptr for travis go tip buildJesse Ezell
2014-04-04merge latest, copy merge bytes to go arrayJesse Ezell
2014-03-26Merge analysis and merge fileJesse Ezell
2014-03-26support nil merge optionsJesse Ezell
2014-03-26update to new merge APIJesse Ezell
2014-03-11remove useless wrappersJesse Ezell
2014-02-28Add defaults, add simple test, merge heads should be pointer arrayJesse Ezell
2014-02-28move finalizer above freeJesse Ezell
2014-02-28switch from iota to explicit defJesse Ezell
2014-02-28merge options / merge tree optionsJesse Ezell
2014-02-28wrap merge functionsJesse Ezell
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-04 22:39:58 +0000