jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Merge functions (in progress) #63

Merged
jezell merged 17 commits from jezell/merge into master 2014-04-26 13:42:18 -05:00
Conversation 5 Commits 17 Files Changed 6 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da64faf8bd - Show all commits

16
merge.go
View File

@ -72,9 +72,9 @@ func (r *Repository) MergeHeadFromRef(ref *Reference) (*MergeHead, error) {
type MergeFlag int type MergeFlag int
const ( const (
MergeFlagDefault MergeFlag = iota MergeFlagDefault MergeFlag = 0
MergeNoFastForward MergeNoFastForward = 1
MergeFastForwardOnly MergeFastForwardOnly = 2
) )
type MergeOptions struct { type MergeOptions struct {
@ -96,16 +96,16 @@ func (mo *MergeOptions) toC() *C.git_merge_opts {
type MergeTreeFlag int type MergeTreeFlag int
const ( const (
MergeTreeFindRenames MergeTreeFlag = 1 << iota MergeTreeFindRenames MergeTreeFlag = 1 << 0
) )
type MergeFileFavorType int type MergeFileFavorType int
const ( const (
MergeFileFavorNormal MergeFileFavorType = iota MergeFileFavorNormal MergeFileFavorType = 0
MergeFileFavorOurs MergeFileFavorOurs = 1
MergeFileFavorTheirs MergeFileFavorTheirs = 2
MergeFileFavorUnion MergeFileFavorUnion = 3
) )
type MergeTreeOptions struct { type MergeTreeOptions struct {