Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make stuff work again #3

Merged
merged 1 commit into from Mar 6, 2012
Merged

Make stuff work again #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/gitcycle.rb
View file
Open in desktop
Expand Up @@ -550,9 +550,9 @@ def checkout_remote_branch(options={})

if branches(:match => target)
if yes?("You already have a branch called '#{target}'. Overwrite?")
run("git push origin :#{target} -q")
run("git push origin :#{target}")
run("git checkout master -q")
run("branch -D #{target}")
run("git branch -D #{target}")
else
run("git checkout #{target} -q")
run("git pull origin #{target} -q")
Expand All @@ -574,7 +574,7 @@ def checkout_remote_branch(options={})
end

puts "Pushing 'origin/#{target}'.\n".green
run("git push origin #{target} -q")
run("git push origin #{target}")
end

def collab?(branch)
Expand Down