Class: Git::Base

Inherits:
Object
  • Object
show all
Defined in:
lib/client/git_adapter/git_gem.rb

Overview

Monkey patch the git merge method to allow passing the –allow-unrelated-histories flag more info: stackoverflow.com/questions/37937984/git-refusing-to-merge-unrelated-histories

Instance Method Summary collapse

Instance Method Details

#merge(branch, message = 'merge', opts = {}) ⇒ Object 



12
13
14
 
# File 'lib/client/git_adapter/git_gem.rb', line 12

def merge(branch, message = 'merge', opts = {})
  self.lib.merge(branch, message, opts)
end

#name_status(branch1 = nil, branch2 = nil, opts = {}) ⇒ Object 



20
21
22
 
# File 'lib/client/git_adapter/git_gem.rb', line 20

def name_status(branch1 = nil, branch2 = nil, opts = {})
  self.lib.name_status(branch1, branch2, opts)
end

#rev_list(sha) ⇒ Object 



16
17
18
 
# File 'lib/client/git_adapter/git_gem.rb', line 16

def rev_list(sha)
  self.lib.rev_list(sha)
end