octo_merge 0.3.0 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/exe/octo-merge +5 -1
- data/lib/octo_merge/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: adea7dbf2172dd7c03e8a0339a7daace935e22cd
|
|
4
|
+
data.tar.gz: df5af4c44bb7c6f60ced0bcf0705e4dbb38ca9b3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e8a5c1510c9f5448f86f3abdea95c0ab7694a5b1a180be542ff73c946c0142499b36522142ca87a5d347ac34736cb12aafac28d0a9a758cce8a1a45d57b8884d
|
|
7
|
+
data.tar.gz: 1ab92d833992e832187d4fcc4dc1d578b1f6fc777dfa53991a5d052779c848f7c3ecc7aa0a0ba0fe1df05c0909cbe336997b7ef51d3e113eab96169d3744e7b4
|
data/exe/octo-merge
CHANGED
|
@@ -4,7 +4,10 @@ require "optparse"
|
|
|
4
4
|
require "octo_merge"
|
|
5
5
|
require "yaml"
|
|
6
6
|
|
|
7
|
-
options = {
|
|
7
|
+
options = {
|
|
8
|
+
dir: ".",
|
|
9
|
+
strategy: "MergeWithoutRebase"
|
|
10
|
+
}
|
|
8
11
|
|
|
9
12
|
user_config_path = File.expand_path("~/.octo-merge.yml")
|
|
10
13
|
|
|
@@ -73,6 +76,7 @@ OctoMerge.configure do |config|
|
|
|
73
76
|
end
|
|
74
77
|
|
|
75
78
|
options[:dir] = File.expand_path(options[:dir])
|
|
79
|
+
|
|
76
80
|
options[:strategy] = Object.const_get("OctoMerge::#{options[:strategy]}")
|
|
77
81
|
|
|
78
82
|
options[:pull_requests] = OctoMerge::InteractivePullRequests.get(options) if options[:interactive]
|
data/lib/octo_merge/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: octo_merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.4.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Patrick Helm
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-03-
|
|
11
|
+
date: 2016-03-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: octokit
|