Updating the git pull command so that we can pass in by option the remote and branch, and it will default to whatever is the normal for the current branch. This way we can also pull in a single remote.

TJ Biddle · TJ Biddle · commit 26e62427a7c0 · 2013-03-28T14:35:45.000-07:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -325,7 +325,7 @@ def each_conflict(&block) # :yields: file, your_version, their_version
     end
 
     # fetches a branch from a remote and merges it into the current working branch
-    def pull(remote = 'origin', branch = 'master')
+    def pull(remote = nil, branch = nil)
       self.lib.pull(remote, branch)
     end
     
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -514,8 +514,11 @@ def merge(branch, message = nil, arr_opts = [])
       command('merge', arr_opts)
     end
 
-    def pull(remote, branch)
-      command('pull', [remote, branch])
+    def pull(remote = nil, branch = nil)
+      opts = []
+      opts << remote if remote
+      opts << branch if branch
+      command('pull', opts)
     end
 
     def unmerged
