hu 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b674ec9985e3ac991e88bcf451a44b13d1cd21b6
-  data.tar.gz: 3d0651f52053bf56a2806efc553d42d131ca158c
+  metadata.gz: a5a1c8a9f5ea62b9552f303f7554f6e658fac29e
+  data.tar.gz: 5809a1b956e007195826841df1bc0d19dd27ba75
 SHA512:
-  metadata.gz: 3cadd159b4da1444da1ce4fa4e96cc8805dd840efd11b79fd27ce5fe310e63e58355bf4ed7b6d41bcf1b5e780c9fe288bba1d98980dbba8e48c1b56323b7596e
-  data.tar.gz: 95801c40cb64d7428168098b123c0e0309701d2e1d956ff3b6f6ba30b5a6629814fe96dae61f6981ed53a62cf26efe2d9b3835aa40475e081c0611136f15446e
+  metadata.gz: c9f74ab65f8dc8d7b783fa343d001826d9661b951567f18d9a802a18df9f7b380d314b8b90c665031564f1990dbe717dc127e340f3d37c1705152043a929817a
+  data.tar.gz: 405869cbb9743772d586f2a5d95e34f13fe4066572bfa701c895316283f038a31a538d935ce38a8aa984881aeff8e0f2f28724f84ae86f0711811ff3443ffbed

data/lib/hu/deploy.rb

@@ -627,7 +627,7 @@ module Hu
 
         # Merge master back into develop
         git checkout develop
-        git merge master
+        git rebase master
         EOS
       end
 

data/lib/hu/version.rb

@@ -1,3 +1,3 @@
 module Hu
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - moe