git-smart 0.1.10 → 0.1.11

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +7 -0
  2. data/VERSION +1 -1
  3. data/lib/git-smart/git_repo.rb +1 -1
  4. metadata +23 -34
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA256:
3
+ metadata.gz: 64ad55375b56d448e73868a6f94752cfdff26dc5ab5fda21c36e4ee25e7388cf
4
+ data.tar.gz: 795a52c8fc520bbc3c37cdc5b66b36a2482f9820f19e1da6cdebd8365a1531bd
5
+ SHA512:
6
+ metadata.gz: c5c6c4acd4930017ea59a695a457232f62fc18807adbf6f93ec65f73289cb9377cbd8fb9a00758ce78e44ee76b29cf979451db27c21313ead3a6f21d7806a331
7
+ data.tar.gz: 9644dcbaaa3e69c34f53d42c87b21cf8aacd29ec7b6d8241694882dcdbcd0c1e1670a0b40354c70cc7d4b3f467a312349295fa85c7ea235344cfceeabbfd915e
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.10
1
+ 0.1.11
data/lib/git-smart/git_repo.rb CHANGED
@@ -115,7 +115,7 @@ class GitRepo
115
115
  end
116
116
 
117
117
  def rebase_preserving_merges!(upstream)
118
- git!('rebase', '-p', upstream)
118
+ git!('rebase', '--rebase-merges', upstream)
119
119
  end
120
120
 
121
121
  def read_log(nr)
metadata CHANGED
@@ -1,8 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git-smart
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.10
5
- prerelease:
4
+ version: 0.1.11
6
5
  platform: ruby
7
6
  authors:
8
7
  - Glen Maddern
@@ -14,65 +13,57 @@ dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: colorize
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ! '>='
17
+ - - ">="
20
18
  - !ruby/object:Gem::Version
21
19
  version: '0'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ! '>='
24
+ - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: '0'
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: rspec
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
33
  version: 2.7.0
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
40
  version: 2.7.0
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: rcov
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - ">="
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - ">="
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: rocco
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - ">="
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - ">="
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  description: Installs some additional 'smart' git commands, like `git smart-pull`.
@@ -86,6 +77,15 @@ extra_rdoc_files:
86
77
  - LICENSE.txt
87
78
  - README.md
88
79
  files:
80
+ - Gemfile
81
+ - Gemfile.lock
82
+ - LICENSE.txt
83
+ - README.md
84
+ - Rakefile
85
+ - VERSION
86
+ - bin/git-smart-log
87
+ - bin/git-smart-merge
88
+ - bin/git-smart-pull
89
89
  - docs/images/git-smart.png
90
90
  - docs/images/smart-log-comparison.png
91
91
  - docs/images/smart-pull-screenshot.png
@@ -105,43 +105,32 @@ files:
105
105
  - lib/git-smart/git_repo.rb
106
106
  - lib/git-smart/git_smart.rb
107
107
  - lib/git-smart/safe_shell.rb
108
- - Gemfile
109
- - Gemfile.lock
110
- - LICENSE.txt
111
- - README.md
112
- - Rakefile
113
- - VERSION
114
108
  - spec/smart-merge_failures_spec.rb
115
109
  - spec/smart-merge_spec.rb
116
110
  - spec/smart-pull_spec.rb
117
111
  - spec/spec_helper.rb
118
- - bin/git-smart-log
119
- - bin/git-smart-merge
120
- - bin/git-smart-pull
121
112
  homepage: http://github.com/geelen/git-smart
122
113
  licenses:
123
114
  - MIT
115
+ metadata: {}
124
116
  post_install_message:
125
117
  rdoc_options: []
126
118
  require_paths:
127
119
  - lib
128
120
  required_ruby_version: !ruby/object:Gem::Requirement
129
- none: false
130
121
  requirements:
131
- - - ! '>='
122
+ - - ">="
132
123
  - !ruby/object:Gem::Version
133
124
  version: '0'
134
125
  required_rubygems_version: !ruby/object:Gem::Requirement
135
- none: false
136
126
  requirements:
137
- - - ! '>='
127
+ - - ">="
138
128
  - !ruby/object:Gem::Version
139
129
  version: '0'
140
130
  requirements: []
141
- rubyforge_project:
142
- rubygems_version: 1.8.23
131
+ rubygems_version: 3.0.3.1
143
132
  signing_key:
144
- specification_version: 3
133
+ specification_version: 4
145
134
  summary: Add some smarts to your git workflow
146
135
  test_files:
147
136
  - spec/smart-merge_failures_spec.rb