lib/dev_flow/girc.rb in dev_flow-0.0.12 vs lib/dev_flow/girc.rb in dev_flow-0.0.13
- old
+ new
@@ -140,9 +140,11 @@
if branch == self.current_branch
info "Pull from remote"
# `#{@git} pull --rebase #{remote} #{branch}`
`#{@git} pull #{remote} #{branch}`
else
+ info "pull branch #{self.current_branch} from remote"
+ `#{@git} pull #{remote} #{self.current_branch}`
info "Switch to branch #{branch}"
`#{@git} fetch #{remote}`
rslt = `#{@git} checkout #{branch}`
raise "Checkout failed: #{rslt}" unless $?.success?
info "Update branch from remote"