ggsm 1.7.2 → 1.7.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ggsm.rb +2 -2
- data/lib/ggsm/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 902f562fd023c7b67253bfa3dcb2705942787429
|
4
|
+
data.tar.gz: 9cbc00a5c5d5ee35f28d981b79157074ea18fa9f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7d812b2f704636442866678fef3ade06d2df2f4f10cd6d499c3cf4ed4cd4b54d36f43133526de11c10e4b4d4319dc15833450def92a87cb9d6cb2d81b2178a6f
|
7
|
+
data.tar.gz: e6edcff5441820dcfda67ea19a356b1f8dd8b7b60a99db75e37674a307177eadb6b04baf64cf1038d703de6ce5ceb03d9cc7344efbc568fe8aa21ccbc0cb5b94
|
data/lib/ggsm.rb
CHANGED
@@ -29,9 +29,9 @@ module GGSM
|
|
29
29
|
end
|
30
30
|
|
31
31
|
desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; --rebase:主工程强制rebase'
|
32
|
-
option :
|
32
|
+
option :rebase, :default => false, :type => :boolean, aliases: '-r'
|
33
33
|
def merge(branch)
|
34
|
-
rebase = options[:
|
34
|
+
rebase = options[:rebase]
|
35
35
|
merge_flow(branch, rebase)
|
36
36
|
end
|
37
37
|
|
data/lib/ggsm/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ggsm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- YoKey
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-09-
|
11
|
+
date: 2017-09-21 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|