ggsm 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd8da8540d6e4e736ff782af1c43fb71b08d95ea
-  data.tar.gz: 571682bd82ddf00beec4397a219c057b83993b0a
+  metadata.gz: 902f562fd023c7b67253bfa3dcb2705942787429
+  data.tar.gz: 9cbc00a5c5d5ee35f28d981b79157074ea18fa9f
 SHA512:
-  metadata.gz: e0a269fc7173ec80d4caa9716ebf5a0f228c520bb4a8067a4dc68f7dc2bc6dd192fbf48bcbc58ee9df6cade109cf447ca63015c634d50c6e86a95923e77db5ca
-  data.tar.gz: c9c6fd2df3576848858315683ba6beefe870e21de8d6f93f7a162a5964363c5dfe071613a4cae3ef7dc6a7e6aa6ac4b0da40ae5ee25090520dc93c783206ceb4
+  metadata.gz: 7d812b2f704636442866678fef3ade06d2df2f4f10cd6d499c3cf4ed4cd4b54d36f43133526de11c10e4b4d4319dc15833450def92a87cb9d6cb2d81b2178a6f
+  data.tar.gz: e6edcff5441820dcfda67ea19a356b1f8dd8b7b60a99db75e37674a307177eadb6b04baf64cf1038d703de6ce5ceb03d9cc7344efbc568fe8aa21ccbc0cb5b94

data/lib/ggsm.rb

@@ -29,9 +29,9 @@ module GGSM
     end
 
     desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; --rebase：主工程强制rebase'
-    option :can_rebase, :default => false, :type => :boolean, aliases: '-r'
+    option :rebase, :default => false, :type => :boolean, aliases: '-r'
     def merge(branch)
-      rebase = options[:can_rebase]
+      rebase = options[:rebase]
       merge_flow(branch, rebase)
     end
 

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.7.2'
+  VERSION = '1.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler