summaryrefslogtreecommitdiff
path: root/merge.go
AgeCommit message (Collapse)Author
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
See http://tip.golang.org/cmd/cgo/#hdr-Passing_pointers .
2015-10-26Mention that MergeAnalysis is a bitmaskCarlos Martín Nieto
2015-10-26Update libgit2 to 821131fCalin Seciu
The API changes are: - `*Remote.Connect` ```go // from: func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks) error // to: func (o *Remote) Connect(direction ConnectDirection, callbacks *RemoteCallbacks, headers []string) error ``` - `*Remote.ConnectFetch` - `headers` was added as above - `*Remote.ConnectPush` - `headers` was added as above
2015-09-18Merge remote-tracking branch 'origin/master' into nextCarlos Martín Nieto
2015-08-31Run go fmtCarlos Martín Nieto
As it seems to be something that many people can't get over, reformat all the files; as we're breaking things, whoever depended on 'next' will have to take many changes into account anyway, so let's include this to reduce the noise of incoming patches.
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
While here, test MergeBase as well.
2015-04-18Update to libgit2 4c02d3937Carlos Martín Nieto
2015-01-29Add TargetDirectory field to Checkout options.joseferminj
TargetDirectory field indicates a alternative checkout path to workdir.
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
While Go will assign the correct type to a const block when it auto-creates the values, assigning makes the const be typeless and will only gain it in each particular use. Make each constant in the blocks have an assigned type.
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-29 01:18:14 +0000