Permalink
Browse files

Use Git::development_branch instead of 'master'

Had forgotten to update hotfix.rb during that change.
  • Loading branch information...
1 parent b8616c3 commit 6fc681b4ed18a41f5a7d0d8c48b072e4b37e7b65 @danielbeardsley danielbeardsley committed Oct 1, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 feature.rb
  2. +5 −5 hotfix.rb
View
@@ -95,7 +95,7 @@
exit 1 if !confirm("Merge feature branch named: '#{feature}' ?")
pull_description = Github::get_pull_request_description_from_api(feature)
- description = "Merge branch #{feature} into master"
+ description = "Merge branch #{feature} into #{Git::development_branch}"
if pull_description
description += "\n\n#{pull_description}"
end
View
@@ -84,15 +84,15 @@
# push the the merge to our origin
# Git::run_safe("git push origin")
- description = "Merge branch #{hotfix} into master"
+ description = "Merge branch #{hotfix} into #{Git::development_branch}"
if pull_description
description += "\n\n#{pull_description}"
end
# Merge into master
- Git::run_safe("git checkout master")
+ Git::run_safe("git checkout #{Git::development_branch}")
# pull the latest changes and rebase the unpushed master commits if any.
- Git::run_safe("git rebase origin/master")
+ Git::run_safe("git rebase origin/#{Git::development_branch}")
# merge the hotfix branch into master
Git::run_safe("git merge --no-ff --edit -m #{description.shellescape} \"#{hotfix}\"")
# push the the merge to our origin
@@ -106,10 +106,10 @@
# checkout stable branch
Git::run_safe("git checkout stable")
- puts "Successfully merged hotfix branch: #{hotfix} into stable and master"
+ puts "Successfully merged hotfix branch: #{hotfix} into stable and #{Git::development_branch}"
puts "If you are satisfied with the result, do this:\n" + <<CMDS
git push
- git checkout master
+ git checkout #{Git::development_branch}
git push
CMDS

0 comments on commit 6fc681b

Please sign in to comment.