gitscape 1.3.3 → 1.3.4
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/gitscape +2 -0
- data/gitscape.gemspec +1 -1
- data/lib/gitscape/base.rb +1 -1
- data/lib/gitscape/version.rb +1 -1
- metadata +23 -10
- checksums.yaml +0 -7
data/bin/gitscape
CHANGED
data/gitscape.gemspec
CHANGED
@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
|
|
7
7
|
s.name = "gitscape"
|
8
8
|
s.version = Gitscape::VERSION
|
9
9
|
s.platform = Gem::Platform::RUBY
|
10
|
-
s.authors = ["Jon Botelho"
|
10
|
+
s.authors = ["Jon Botelho"]
|
11
11
|
s.email = ["gitscape@eachscape.com"]
|
12
12
|
s.homepage = "https://github.com/eachscape/gitscape"
|
13
13
|
s.summary = "Various Git utilities for cherry-pick/rebase workflows."
|
data/lib/gitscape/base.rb
CHANGED
@@ -11,7 +11,7 @@ class Gitscape::Base
|
|
11
11
|
@merge_options = "--no-ff"
|
12
12
|
# Setup additional merge options based on the version of Git we have
|
13
13
|
if git_version_at_least "1.7.4.0"
|
14
|
-
@merge_options += "-s recursive -Xignore-space-change"
|
14
|
+
@merge_options += " -s recursive -Xignore-space-change"
|
15
15
|
else
|
16
16
|
warn "Ignoring whitespace changes in merges is only available on Git 1.7.4+"
|
17
17
|
end
|
data/lib/gitscape/version.rb
CHANGED
metadata
CHANGED
@@ -1,16 +1,21 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: gitscape
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
|
4
|
+
prerelease: false
|
5
|
+
segments:
|
6
|
+
- 1
|
7
|
+
- 3
|
8
|
+
- 4
|
9
|
+
version: 1.3.4
|
5
10
|
platform: ruby
|
6
11
|
authors:
|
7
12
|
- Jon Botelho
|
8
|
-
- Xavier Matos
|
9
13
|
autorequire:
|
10
14
|
bindir: bin
|
11
15
|
cert_chain: []
|
12
16
|
|
13
|
-
date: 2013-03-
|
17
|
+
date: 2013-03-08 00:00:00 -05:00
|
18
|
+
default_executable:
|
14
19
|
dependencies:
|
15
20
|
- !ruby/object:Gem::Dependency
|
16
21
|
name: git
|
@@ -19,6 +24,10 @@ dependencies:
|
|
19
24
|
requirements:
|
20
25
|
- - ~>
|
21
26
|
- !ruby/object:Gem::Version
|
27
|
+
segments:
|
28
|
+
- 1
|
29
|
+
- 2
|
30
|
+
- 5
|
22
31
|
version: 1.2.5
|
23
32
|
type: :runtime
|
24
33
|
version_requirements: *id001
|
@@ -41,11 +50,10 @@ files:
|
|
41
50
|
- lib/gitscape.rb
|
42
51
|
- lib/gitscape/base.rb
|
43
52
|
- lib/gitscape/version.rb
|
53
|
+
has_rdoc: true
|
44
54
|
homepage: https://github.com/eachscape/gitscape
|
45
55
|
licenses: []
|
46
56
|
|
47
|
-
metadata: {}
|
48
|
-
|
49
57
|
post_install_message:
|
50
58
|
rdoc_options: []
|
51
59
|
|
@@ -53,19 +61,24 @@ require_paths:
|
|
53
61
|
- lib
|
54
62
|
required_ruby_version: !ruby/object:Gem::Requirement
|
55
63
|
requirements:
|
56
|
-
-
|
57
|
-
- ">="
|
64
|
+
- - ">="
|
58
65
|
- !ruby/object:Gem::Version
|
66
|
+
segments:
|
67
|
+
- 0
|
59
68
|
version: "0"
|
60
69
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
61
70
|
requirements:
|
62
|
-
-
|
71
|
+
- - ">="
|
72
|
+
- !ruby/object:Gem::Version
|
73
|
+
segments:
|
74
|
+
- 0
|
75
|
+
version: "0"
|
63
76
|
requirements: []
|
64
77
|
|
65
78
|
rubyforge_project:
|
66
|
-
rubygems_version:
|
79
|
+
rubygems_version: 1.3.6
|
67
80
|
signing_key:
|
68
|
-
specification_version:
|
81
|
+
specification_version: 3
|
69
82
|
summary: Various Git utilities for cherry-pick/rebase workflows.
|
70
83
|
test_files: []
|
71
84
|
|
checksums.yaml
DELETED
@@ -1,7 +0,0 @@
|
|
1
|
-
---
|
2
|
-
SHA512:
|
3
|
-
data.tar.gz: 17284fed4972659c5d7fed7eafb9744933e60428cb86c40689c331e202c5b390f434289999b61cbb2fef79a59ba94f7beb01c60a70e7ef547a7239382c460847
|
4
|
-
metadata.gz: 9bbe2341a929fb3bcbd537edabdac4ae0d802b700dea829cf019cba30cd2d291d21366ba8e5d23240de1f9c769de7b0e640e9f31e43effcd5b07e41203df7aba
|
5
|
-
SHA1:
|
6
|
-
data.tar.gz: 73a4a0ed709e139f80d631ff1b753007504aa503
|
7
|
-
metadata.gz: f25b55976fe44530ce59d5a2b76a139cf321ce46
|