lib/gitscape/base.rb in gitscape-1.3.6 vs lib/gitscape/base.rb in gitscape-1.3.7

@@ -198,11 +198,11 @@
       end
     end
 
     # Checkout release branch
     puts `git checkout #{release_branch_name}`
-    puts `git pull live`
+    puts `git pull #{release_branch_name}`
 
     # Checkout live
     puts `git checkout live`
     puts `git pull live`
 
@@ -234,10 +234,10 @@
     # Record the revision of live used for the release tag
     live_release_revision = `git log -n1 --oneline`.scan(/(^[^ ]+) .*$/).flatten[0]
 
     # Merge the release branch into master 
     puts `git checkout master`
-    puts `git pull`
+    puts `git pull master`
     puts `git merge #{merge_options} #{release_branch_name}`
 
     # Error and conflict checking
     if !$?.success? then exit 4 end
     if git_has_conflicts then