gitscape 1.3.6 → 1.3.7
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/gitscape/base.rb +2 -2
- data/lib/gitscape/version.rb +1 -1
- metadata +2 -2
data/lib/gitscape/base.rb
CHANGED
@@ -200,7 +200,7 @@ class Gitscape::Base
|
|
200
200
|
|
201
201
|
# Checkout release branch
|
202
202
|
puts `git checkout #{release_branch_name}`
|
203
|
-
puts `git pull
|
203
|
+
puts `git pull #{release_branch_name}`
|
204
204
|
|
205
205
|
# Checkout live
|
206
206
|
puts `git checkout live`
|
@@ -236,7 +236,7 @@ class Gitscape::Base
|
|
236
236
|
|
237
237
|
# Merge the release branch into master
|
238
238
|
puts `git checkout master`
|
239
|
-
puts `git pull`
|
239
|
+
puts `git pull master`
|
240
240
|
puts `git merge #{merge_options} #{release_branch_name}`
|
241
241
|
|
242
242
|
# Error and conflict checking
|
data/lib/gitscape/version.rb
CHANGED