diff --git a/lib/git/base.rb b/lib/git/base.rb index dd9b6bb7..562c8116 100644 --- a/lib/git/base.rb +++ b/lib/git/base.rb @@ -334,7 +334,7 @@ def each_conflict(&block) # :yields: file, your_version, their_version # fetches a branch from a remote and merges it into the current working branch def pull(remote = 'origin', branch = 'master', message = 'origin pull') fetch(remote) - merge(branch, message) + merge(remote + "/" + branch, message) end # returns an array of Git:Remote objects