git-scripts 0.6.0 → 0.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/feature +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2c2ca318fe924aa752aca19278ee740d1f90f300
|
|
4
|
+
data.tar.gz: c35e8a783f980234da278208b129cc1b9b5d88c1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 05edfaba837411ded980bf6775fed80078995c3e024d90c20096273cc07ce01b2b3789090c8fe66c8aa4707e78354664875663bf6a4d173cd3e29b04624566e3
|
|
7
|
+
data.tar.gz: '04906e08307d0943c156f5d4535cb3fff76e4489b2c20e2dca732adc5e1ac60538f0bf7fa1dc3db4f94d37b7619e9ff81548e641327e0d4612c0f8a4f440efcc'
|
data/bin/feature
CHANGED
|
@@ -203,7 +203,7 @@ when 'merge'
|
|
|
203
203
|
merge_failure_message =
|
|
204
204
|
"Merge conflicts detected, merge #{dev_branch} into #{feature} and resolve conflicts."
|
|
205
205
|
abort_merge =
|
|
206
|
-
"(git merge --abort && echo #{highlight(
|
|
206
|
+
"(git merge --abort && echo #{highlight(merge_failure_message.shellescape)} && exit 1)"
|
|
207
207
|
|
|
208
208
|
Git::run_safe([
|
|
209
209
|
"git fetch",
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-scripts
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Daniel Beardsley
|
|
@@ -11,7 +11,7 @@ authors:
|
|
|
11
11
|
autorequire:
|
|
12
12
|
bindir: bin
|
|
13
13
|
cert_chain: []
|
|
14
|
-
date: 2017-05-
|
|
14
|
+
date: 2017-05-15 00:00:00.000000000 Z
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: bundler
|
|
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
157
157
|
version: '0'
|
|
158
158
|
requirements: []
|
|
159
159
|
rubyforge_project:
|
|
160
|
-
rubygems_version: 2.5.
|
|
160
|
+
rubygems_version: 2.5.2
|
|
161
161
|
signing_key:
|
|
162
162
|
specification_version: 4
|
|
163
163
|
summary: User scripts for managing feature branches and hotfixes.
|