Jesse Ezell
|
9d8cbe7547
|
use cast_ptr instead of ptr for travis go tip build
|
2014-04-04 00:47:21 -07:00 |
|
Jesse Ezell
|
864c57f554
|
merge latest, copy merge bytes to go array
|
2014-04-04 00:22:42 -07:00 |
|
Jesse Ezell
|
0b48ba2224
|
Merge analysis and merge file
|
2014-03-26 14:42:01 -07:00 |
|
Jesse Ezell
|
eff3a8b4d0
|
support nil merge options
|
2014-03-26 12:17:23 -07:00 |
|
Jesse Ezell
|
50a3c4aa09
|
update to new merge API
|
2014-03-26 11:28:48 -07:00 |
|
Jesse Ezell
|
85420f2002
|
Merge branch 'master' of http://github.com/libgit2/git2go into merge
|
2014-03-26 11:18:21 -07:00 |
|
Jesse Ezell
|
8ad5cbc537
|
Merge branch 'merge' of https://github.com/jezell/git2go into merge
|
2014-03-11 12:49:29 -07:00 |
|
Jesse Ezell
|
6a068d5265
|
remove useless wrappers
|
2014-03-11 12:47:56 -07:00 |
|
Jesse Ezell
|
86efca0630
|
Merge branch 'jezell/merge' into merge
|
2014-03-11 12:42:18 -07:00 |
|
Jesse Ezell
|
7cbbeff7ac
|
merge with latest
|
2014-03-11 12:42:08 -07:00 |
|
Jesse Ezell
|
f1e889928a
|
merge with latest, replace merge wrappers with go code
|
2014-03-11 12:29:40 -07:00 |
|
Jesse Ezell
|
e5946d4009
|
Add defaults, add simple test, merge heads should be pointer array
|
2014-02-28 14:33:38 -08:00 |
|
Jesse Ezell
|
6af4d4a825
|
move finalizer above free
|
2014-02-28 11:15:39 -08:00 |
|
Jesse Ezell
|
da64faf8bd
|
switch from iota to explicit def
|
2014-02-28 11:13:51 -08:00 |
|
Jesse Ezell
|
5f5906878e
|
merge options / merge tree options
|
2014-02-28 01:31:01 -08:00 |
|
Jesse Ezell
|
9e7ba02708
|
wrap merge functions
|
2014-02-28 01:06:41 -08:00 |
|
Jesse Ezell
|
0497d2b114
|
fix bad merge (LastError -> MakeGitError)
|
2014-02-28 00:21:48 -08:00 |