Adding git pull examples

robertodecurnex · robertodecurnex · commit a80e1bb3d2ca · 2013-08-16T12:21:29.000-03:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -331,8 +331,13 @@ def each_conflict(&block) # :yields: file, your_version, their_version
       self.lib.conflicts(&block)
     end
 
-    # fetches a branch from a remote and merges it into the current working branch
-    def pull(remote = 'origin', branch = 'master')
+    # pulls the given branch from the given remote into the current branch
+    #
+    #  @git.pull                          # pulls from origin/master
+    #  @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)
     end
     
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -544,7 +544,7 @@ def push(remote, branch = 'master', tags = false)
       command('push', ['--tags', remote]) if tags
     end
 
-		def pull(remote = 'origin', branch = 'master')
+		def pull(remote='origin', branch='master')
 			command('pull', [remote, branch])
 		end
 
