added opts to base.rb > pull method

iSimar · web-flow · commit 9f4cd12ef519 · 2021-06-15T14:16:21.000-04:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -386,8 +386,8 @@ def each_conflict(&block) # :yields: file, your_version, their_version
     #  @git.pull('upstream')              # pulls from upstream/master
     #  @git.pull('upstream', 'develope')  # pulls from upstream/develop
     #
-    def pull(remote='origin', branch='master')
-      self.lib.pull(remote, branch)
+    def pull(remote='origin', branch='master', opts = {})
+      self.lib.pull(remote, branch, opts)
     end
 
     # returns an array of Git:Remote objects
