ebm 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 992915ca9318b3a1771ac408a516e1aff08c4d3e
-  metadata.gz: 31e420ce369332e349abb147f778cdad71cbac14
+  data.tar.gz: 880aa4afa58fb431557e4c536274c9d6e3e2b58b
+  metadata.gz: ca00f9018019aac30177d270abeace65ff36ae5e
 SHA512: 
-  data.tar.gz: a8330e7c3981e410f9751f2a3ef24daaf410ec3c5d3c68490883899648a658ee1240f66562a22bc23ff6fb4d3fe78128c2b6dc90922e7904d2126b9dd84721fd
-  metadata.gz: 6c6d7bc01b509ae2c8e7e23c6058f18d55f108280f97346c798bbd23d3f0454209e3dd273f9d7761a9a4b85d414daf192c9a692174c408d948f015c2156c48cd
+  data.tar.gz: 9fdc5737c5a322c469aabb9923afe7c970bc2e0bcf11c613a1aac8dbe1cccd6a67ecab661b90d99aa6f931a98b91f2bc718c7b359717dc34c654c7c891dc7a92
+  metadata.gz: 3085c7992fba5e92ee3a5800837d1cd9ac8d833f708d711f1d3ff058d4f27d9151c031cc41a755ab5d3fd43be23b9f7ab35cadb78499759864fcd68d5e7996b0

data/lib/commands/pull.rb

@@ -94,16 +94,16 @@ module Commands
         elsif repo[:create_dev_branch]
           if remote_version
             # pulling from remote version branch
-            cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{branch}"
+            cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes origin #{branch}"
           elsif base_version
             # pulling from base remote version branch
             if base_branch.nil?
               raise "You specified base-version but the config has no base_branch."
             end
-            cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{base_branch}"
+            cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes origin #{base_branch}"
           else
             # pull from the remote branch of the current branch
-            cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes"
+            cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes"
           end
 
           exit_code = EbmSharedLib::CL.do_cmd_ignore_str(cmd, "Automatic merge failed", repo_path)

data/lib/info.rb

@@ -7,6 +7,6 @@
 #
 class Info
   def self.version
-    "0.0.33"
+    "0.0.34"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebm
 version: !ruby/object:Gem::Version 
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors: 
 - Greg Seitz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-16 00:00:00 Z
+date: 2013-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: subcommand