dev_flow 0.0.5 → 0.0.6

data/lib/dev_flow/girc.rb

@@ -137,15 +137,17 @@ module DevFlow
       end
 
       if branch == self.current_branch
-        info "Rebase pull from remote"
-        `#{@git} pull --rebase #{remote} #{branch}`
+        info "Pull from remote"
+        # `#{@git} pull --rebase #{remote} #{branch}`
+        `#{@git} pull #{remote} #{branch}`
       else
         info "Switch to branch #{branch}"
         `#{@git} fetch #{remote}`
         rslt = `#{@git} checkout #{branch}`
         raise "Checkout failed: #{rslt}" unless $?.success?
-        info "Update (rabase) branch"
-        rslt = `#{@git} pull --rebase #{remote} #{branch}`
+        info "Update branch from remote"
+        # rslt = `#{@git} pull --rebase #{remote} #{branch}`
+        rslt = `#{@git} pull #{remote} #{branch}`
         raise "Rebase pull for #{branch} failed: #{rslt}" unless $?.success?
         info "Switch back to branch #{cb}"
         `#{@git} checkout #{cb}`

data/lib/dev_flow/version.rb

@@ -1,3 +1,3 @@
 module DevFlow
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_flow
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor