git-scripts 0.5.2 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/feature +6 -10
- data/completion/_feature +1 -1
- data/completion/bash_completion.sh +2 -2
- data/lib/git.rb +5 -4
- data/lib/github.rb +9 -12
- data/lib/helpers.rb +0 -1
- data/man/feature.1 +0 -4
- data/man/feature.1.ronn +0 -2
- data/man/index.txt +0 -1
- metadata +58 -144
- data/man/feature-clean.1 +0 -31
- data/man/feature-clean.1.html +0 -120
- data/man/feature-clean.1.markdown +0 -63
- data/man/feature-clean.1.ronn +0 -30
- data/man/feature-finish-issue.1.html +0 -113
- data/man/feature-finish-issue.1.markdown +0 -58
- data/man/feature-finish.1.html +0 -113
- data/man/feature-finish.1.markdown +0 -58
- data/man/feature-github-test.1.html +0 -110
- data/man/feature-github-test.1.markdown +0 -55
- data/man/feature-list.1.html +0 -119
- data/man/feature-list.1.markdown +0 -62
- data/man/feature-merge.1.html +0 -116
- data/man/feature-merge.1.markdown +0 -61
- data/man/feature-prune.1.html +0 -116
- data/man/feature-prune.1.markdown +0 -62
- data/man/feature-start.1.html +0 -110
- data/man/feature-start.1.markdown +0 -55
- data/man/feature-stashes.1.html +0 -122
- data/man/feature-stashes.1.markdown +0 -65
- data/man/feature-status.1.html +0 -113
- data/man/feature-status.1.markdown +0 -58
- data/man/feature-switch.1.html +0 -122
- data/man/feature-switch.1.markdown +0 -66
- data/man/feature-url.1.html +0 -110
- data/man/feature-url.1.markdown +0 -55
- data/man/feature.1.html +0 -131
- data/man/feature.1.markdown +0 -86
- data/man/hotfix-finish-issue.1.html +0 -113
- data/man/hotfix-finish-issue.1.markdown +0 -58
- data/man/hotfix-finish.1.html +0 -112
- data/man/hotfix-finish.1.markdown +0 -57
- data/man/hotfix-list.1.html +0 -119
- data/man/hotfix-list.1.markdown +0 -62
- data/man/hotfix-merge.1.html +0 -116
- data/man/hotfix-merge.1.markdown +0 -61
- data/man/hotfix-start.1.html +0 -110
- data/man/hotfix-start.1.markdown +0 -55
- data/man/hotfix-switch.1.html +0 -122
- data/man/hotfix-switch.1.markdown +0 -66
- data/man/hotfix-url.1.html +0 -110
- data/man/hotfix-url.1.markdown +0 -55
- data/man/hotfix.1.html +0 -125
- data/man/hotfix.1.markdown +0 -74
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e9b4f12ba04e96faf00883173c8d0cea0845c7e0
|
4
|
+
data.tar.gz: 12c60f2f395b73a419140064ed3b1fd2eb017105
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 70be3f8dd49d10c9ebf885e5d70b8cb47633e1357be73ba0ec9e86bb813259e060fd5967fabee47c21aeafd1eac88b29640715a2d34743a4f4d04dcab95c10d4
|
7
|
+
data.tar.gz: c89cf48939bc391ad923d037f4017155f7406ec430fe49720aa8985e9cba2a796cc7225f26a864b59a7a6749f2efcb0f7363b3dca5f563ea356a069b88cb670c
|
data/bin/feature
CHANGED
@@ -199,6 +199,11 @@ when 'merge'
|
|
199
199
|
exit 1 unless confirm("Merge feature branch named: '#{feature}' ?")
|
200
200
|
|
201
201
|
update = Git::submodules_update("get")
|
202
|
+
pull_desc = pull_info[:description]
|
203
|
+
merge_failure_message =
|
204
|
+
"Merge conflicts detected, merge #{dev_branch} into #{feature} and resolve conflicts."
|
205
|
+
abort_merge =
|
206
|
+
"(git merge --abort && echo #{highlight(failure_message.shellescape)} && exit 1)"
|
202
207
|
|
203
208
|
Git::run_safe([
|
204
209
|
"git fetch",
|
@@ -210,7 +215,7 @@ when 'merge'
|
|
210
215
|
# rebase the unpushed master commits if any.
|
211
216
|
"git rebase --preserve-merges origin/#{dev_branch}",
|
212
217
|
# merge the feature branch into master
|
213
|
-
"git merge --no-ff --edit -m #{
|
218
|
+
"git merge --no-ff --edit -m #{pull_desc.shellescape} \"#{feature}\" || #{abort_merge}",
|
214
219
|
# init any submodules in the master branch
|
215
220
|
"#{update}",
|
216
221
|
# delete the local feature-branch
|
@@ -326,15 +331,6 @@ when 'prune'
|
|
326
331
|
delete.call
|
327
332
|
end
|
328
333
|
|
329
|
-
when 'clean'
|
330
|
-
args = ''
|
331
|
-
|
332
|
-
# Remove all untracked .gitignore'd files as well
|
333
|
-
args += 'x' if ARGV.include?('--all')
|
334
|
-
|
335
|
-
# -fd alone will NOT remove submodule directories, -ffd is required for this
|
336
|
-
Git::run_safe(["git clean -ffd#{args}"])
|
337
|
-
|
338
334
|
when 'pull'
|
339
335
|
Git::run_safe(["git fetch"])
|
340
336
|
|
data/completion/_feature
CHANGED
@@ -11,7 +11,7 @@ _feature() {
|
|
11
11
|
|
12
12
|
case $state in
|
13
13
|
commands)
|
14
|
-
_arguments '1:Commands:(list start switch finish finish-issue merge pull prune status stashes
|
14
|
+
_arguments '1:Commands:(list start switch finish finish-issue merge pull prune status stashes github-test url)'
|
15
15
|
;;
|
16
16
|
params)
|
17
17
|
if [[ "$words[2]" == "prune" ]]; then
|
@@ -10,7 +10,7 @@ _git-scripts()
|
|
10
10
|
case "$cmd" in
|
11
11
|
feature)
|
12
12
|
if [ "$line" = "$cmd $cur" ]; then
|
13
|
-
words="switch start finish finish-issue stashes list merge pull status
|
13
|
+
words="switch start finish finish-issue stashes list merge pull status prune url"
|
14
14
|
else
|
15
15
|
# get branch names minus hotfixes
|
16
16
|
words="$(git branch -a | tr -d ' *' | grep -v 'hotfix-' | sed 's|remotes/origin/||')"
|
@@ -18,7 +18,7 @@ _git-scripts()
|
|
18
18
|
;;
|
19
19
|
hotfix)
|
20
20
|
if [ "$line" = "$cmd $cur" ]; then
|
21
|
-
words="switch start finish finish-issue merge list
|
21
|
+
words="switch start finish finish-issue merge list url"
|
22
22
|
else
|
23
23
|
# get hotfix branch names
|
24
24
|
words="$(git branch -a | tr -d ' *' | grep 'hotfix-' | sed -e 's|remotes/origin/||' -e 's|hotfix-||')"
|
data/lib/git.rb
CHANGED
@@ -131,12 +131,13 @@ module Git
|
|
131
131
|
|
132
132
|
def self.run_safe(commands)
|
133
133
|
while command = commands.shift
|
134
|
-
|
134
|
+
safe_command = command.gsub(/[^[:print:]]+/,' ')
|
135
|
+
puts "> " + safe_command
|
135
136
|
unless system(command)
|
136
|
-
puts highlight("\
|
137
|
-
puts "\
|
137
|
+
puts highlight("\nERROR: failed on #{safe_command}`.")
|
138
|
+
puts "\nWould have run:"
|
138
139
|
commands.each do |command|
|
139
|
-
puts "
|
140
|
+
puts "# " + command.gsub(/[^[:print:]]+/,' ')
|
140
141
|
end
|
141
142
|
abort
|
142
143
|
end
|
data/lib/github.rb
CHANGED
@@ -7,16 +7,13 @@ require 'highline/import'
|
|
7
7
|
|
8
8
|
module Github
|
9
9
|
##
|
10
|
-
# Get a
|
10
|
+
# Get a git config property from the first place that defines it. The `git
|
11
|
+
# config` command takes properties, by default, from the repository, the
|
12
|
+
# user's config, and the system config, in that order. We used to specify
|
13
|
+
# `--global` here, but that means to read _only_ from the global config, and
|
14
|
+
# it also prohibits processing includes by default.
|
11
15
|
##
|
12
16
|
def self.config(property)
|
13
|
-
`git config --global #{property.to_s.shellescape}`.strip
|
14
|
-
end
|
15
|
-
|
16
|
-
##
|
17
|
-
# Get a local (to the repo) git config property
|
18
|
-
##
|
19
|
-
def self.local_config(property)
|
20
17
|
`git config #{property.to_s.shellescape}`.strip
|
21
18
|
end
|
22
19
|
|
@@ -35,7 +32,7 @@ module Github
|
|
35
32
|
##
|
36
33
|
def self.api(authorization_info = {})
|
37
34
|
# Let Octokit handle pagination automagically for us.
|
38
|
-
Octokit.
|
35
|
+
Octokit.auto_paginate = true
|
39
36
|
# Defaults
|
40
37
|
authorization_info = {
|
41
38
|
:scopes => ['repo'],
|
@@ -49,7 +46,7 @@ module Github
|
|
49
46
|
username = self::config("github.user")
|
50
47
|
token = self::config("github.token")
|
51
48
|
if !username.empty? && !token.empty?
|
52
|
-
return {:login => username, :
|
49
|
+
return {:login => username, :access_token => token}
|
53
50
|
else
|
54
51
|
return self::request_authorization(authorization_info)
|
55
52
|
end
|
@@ -83,7 +80,7 @@ module Github
|
|
83
80
|
die("Couldn't set git config")
|
84
81
|
end
|
85
82
|
|
86
|
-
return {:login => username, :
|
83
|
+
return {:login => username, :access_token => auth[:token]}
|
87
84
|
end
|
88
85
|
|
89
86
|
##
|
@@ -93,7 +90,7 @@ module Github
|
|
93
90
|
# Requires the "origin" remote to be set to a github url
|
94
91
|
##
|
95
92
|
def self.get_github_repo()
|
96
|
-
url = self::
|
93
|
+
url = self::config("remote.origin.url")
|
97
94
|
m = /github\.com.(.*?)\/(.*)/.match(url)
|
98
95
|
if m
|
99
96
|
return [m[1], m[2].sub(/\.git\Z/, "")].join("/")
|
data/lib/helpers.rb
CHANGED
@@ -23,7 +23,6 @@ def display_feature_help(command = nil, message = nil)
|
|
23
23
|
:prune => "feature prune <local | origin> <preview | clean>",
|
24
24
|
:status => "feature status",
|
25
25
|
:stashes => "feature stashes [-v]",
|
26
|
-
:clean => "feature clean [--all]",
|
27
26
|
:'github-test' => "feature github-test"
|
28
27
|
},
|
29
28
|
:command_name => 'feature',
|
data/man/feature.1
CHANGED
data/man/feature.1.ronn
CHANGED
@@ -34,8 +34,6 @@ feature(1) - Perform actions on a git feature branch.
|
|
34
34
|
Determine if the current branch is up-to-date with the remote branch.
|
35
35
|
* feature-stashes(1):
|
36
36
|
Show stashes saved on the current branch.
|
37
|
-
* feature-clean(1):
|
38
|
-
Remove untracked files and submodules.
|
39
37
|
* feature-github-test(1):
|
40
38
|
Test Github authentication.
|
41
39
|
|
data/man/index.txt
CHANGED
@@ -7,7 +7,6 @@ feature-merge(1) feature-merge.1.ronn
|
|
7
7
|
feature-pull(1) feature-pull.1.ronn
|
8
8
|
feature-status(1) feature-status.1.ronn
|
9
9
|
feature-stashes(1) feature-stashes.1.ronn
|
10
|
-
feature-clean(1) feature-clean.1.ronn
|
11
10
|
feature-github-test(1) feature-github-test.1.ronn
|
12
11
|
|
13
12
|
hotfix(1) hotfix.1.ronn
|
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.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Daniel Beardsley
|
@@ -11,106 +11,64 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date:
|
14
|
+
date: 2017-05-01 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: bundler
|
18
18
|
requirement: !ruby/object:Gem::Requirement
|
19
19
|
requirements:
|
20
|
-
- -
|
20
|
+
- - ">="
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: '0'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
|
-
- -
|
27
|
+
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: '0'
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: octokit
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
33
33
|
requirements:
|
34
|
-
- - ~>
|
34
|
+
- - "~>"
|
35
35
|
- !ruby/object:Gem::Version
|
36
|
-
version:
|
36
|
+
version: 3.0.0
|
37
37
|
type: :runtime
|
38
38
|
prerelease: false
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
|
-
- - ~>
|
41
|
+
- - "~>"
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version:
|
43
|
+
version: 3.0.0
|
44
44
|
- !ruby/object:Gem::Dependency
|
45
|
-
name:
|
45
|
+
name: highline
|
46
46
|
requirement: !ruby/object:Gem::Requirement
|
47
47
|
requirements:
|
48
|
-
- -
|
48
|
+
- - ">="
|
49
49
|
- !ruby/object:Gem::Version
|
50
|
-
version:
|
50
|
+
version: '0'
|
51
51
|
type: :runtime
|
52
52
|
prerelease: false
|
53
53
|
version_requirements: !ruby/object:Gem::Requirement
|
54
54
|
requirements:
|
55
|
-
- -
|
55
|
+
- - ">="
|
56
56
|
- !ruby/object:Gem::Version
|
57
|
-
version:
|
57
|
+
version: '0'
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
|
-
name:
|
59
|
+
name: json
|
60
60
|
requirement: !ruby/object:Gem::Requirement
|
61
61
|
requirements:
|
62
|
-
- -
|
62
|
+
- - "~>"
|
63
63
|
- !ruby/object:Gem::Version
|
64
64
|
version: 1.8.0
|
65
65
|
type: :runtime
|
66
66
|
prerelease: false
|
67
67
|
version_requirements: !ruby/object:Gem::Requirement
|
68
68
|
requirements:
|
69
|
-
- -
|
69
|
+
- - "~>"
|
70
70
|
- !ruby/object:Gem::Version
|
71
71
|
version: 1.8.0
|
72
|
-
- !ruby/object:Gem::Dependency
|
73
|
-
name: highline
|
74
|
-
requirement: !ruby/object:Gem::Requirement
|
75
|
-
requirements:
|
76
|
-
- - '='
|
77
|
-
- !ruby/object:Gem::Version
|
78
|
-
version: 1.6.19
|
79
|
-
type: :runtime
|
80
|
-
prerelease: false
|
81
|
-
version_requirements: !ruby/object:Gem::Requirement
|
82
|
-
requirements:
|
83
|
-
- - '='
|
84
|
-
- !ruby/object:Gem::Version
|
85
|
-
version: 1.6.19
|
86
|
-
- !ruby/object:Gem::Dependency
|
87
|
-
name: faraday
|
88
|
-
requirement: !ruby/object:Gem::Requirement
|
89
|
-
requirements:
|
90
|
-
- - '='
|
91
|
-
- !ruby/object:Gem::Version
|
92
|
-
version: 0.8.8
|
93
|
-
type: :runtime
|
94
|
-
prerelease: false
|
95
|
-
version_requirements: !ruby/object:Gem::Requirement
|
96
|
-
requirements:
|
97
|
-
- - '='
|
98
|
-
- !ruby/object:Gem::Version
|
99
|
-
version: 0.8.8
|
100
|
-
- !ruby/object:Gem::Dependency
|
101
|
-
name: faraday_middleware
|
102
|
-
requirement: !ruby/object:Gem::Requirement
|
103
|
-
requirements:
|
104
|
-
- - '='
|
105
|
-
- !ruby/object:Gem::Version
|
106
|
-
version: 0.9.0
|
107
|
-
type: :runtime
|
108
|
-
prerelease: false
|
109
|
-
version_requirements: !ruby/object:Gem::Requirement
|
110
|
-
requirements:
|
111
|
-
- - '='
|
112
|
-
- !ruby/object:Gem::Version
|
113
|
-
version: 0.9.0
|
114
72
|
description: User scripts for managing feature branches and hotfixes.
|
115
73
|
email:
|
116
74
|
- daniel@ifixit.com
|
@@ -126,104 +84,60 @@ extra_rdoc_files:
|
|
126
84
|
- README.md
|
127
85
|
files:
|
128
86
|
- COPYING
|
129
|
-
- Rakefile
|
130
87
|
- README.md
|
88
|
+
- Rakefile
|
89
|
+
- bin/feature
|
90
|
+
- bin/hotfix
|
131
91
|
- completion/_feature
|
132
|
-
- completion/bash_completion.sh
|
133
92
|
- completion/_hotfix
|
134
|
-
-
|
135
|
-
- bin/feature
|
93
|
+
- completion/bash_completion.sh
|
136
94
|
- lib/git.rb
|
137
|
-
- lib/signal_handlers.rb
|
138
|
-
- lib/plugins.rb
|
139
|
-
- lib/helpers.rb
|
140
95
|
- lib/github.rb
|
141
|
-
-
|
142
|
-
-
|
143
|
-
-
|
144
|
-
- man/hotfix-finish-issue.1.html
|
145
|
-
- man/feature-status.1.html
|
146
|
-
- man/feature-stashes.1.html
|
147
|
-
- man/hotfix-merge.1.ronn
|
148
|
-
- man/feature-github-test.1
|
149
|
-
- man/hotfix-switch.1.ronn
|
150
|
-
- man/hotfix-finish-issue.1
|
151
|
-
- man/feature.1.html
|
152
|
-
- man/feature-stashes.1.ronn
|
153
|
-
- man/hotfix-url.1.markdown
|
154
|
-
- man/feature-clean.1.html
|
155
|
-
- man/hotfix.1
|
96
|
+
- lib/helpers.rb
|
97
|
+
- lib/plugins.rb
|
98
|
+
- lib/signal_handlers.rb
|
156
99
|
- man/feature-finish-issue.1
|
157
|
-
- man/feature-finish-issue.1.
|
158
|
-
- man/
|
159
|
-
- man/feature-
|
160
|
-
- man/feature-
|
161
|
-
- man/feature-start.1.html
|
162
|
-
- man/hotfix.1.html
|
163
|
-
- man/feature-list.1.markdown
|
164
|
-
- man/hotfix-finish.1.markdown
|
165
|
-
- man/feature-url.1.html
|
166
|
-
- man/hotfix-merge.1.html
|
167
|
-
- man/feature-stashes.1.markdown
|
168
|
-
- man/feature-merge.1.html
|
169
|
-
- man/feature-switch.1.html
|
170
|
-
- man/hotfix-start.1
|
171
|
-
- man/index.html
|
172
|
-
- man/feature-prune.1.ronn
|
173
|
-
- man/feature-list.1.html
|
174
|
-
- man/hotfix-list.1.markdown
|
100
|
+
- man/feature-finish-issue.1.ronn
|
101
|
+
- man/feature-finish.1
|
102
|
+
- man/feature-finish.1.ronn
|
103
|
+
- man/feature-github-test.1
|
175
104
|
- man/feature-github-test.1.ronn
|
176
|
-
- man/feature-prune.1.markdown
|
177
|
-
- man/feature.1.ronn
|
178
|
-
- man/feature.1.markdown
|
179
|
-
- man/feature-url.1.ronn
|
180
|
-
- man/feature-switch.1.markdown
|
181
|
-
- man/hotfix.1.markdown
|
182
|
-
- man/hotfix-merge.1.markdown
|
183
|
-
- man/hotfix.1.ronn
|
184
|
-
- man/hotfix-url.1.html
|
185
|
-
- man/feature-github-test.1.html
|
186
|
-
- man/hotfix-url.1
|
187
|
-
- man/hotfix-finish.1.ronn
|
188
|
-
- man/feature-merge.1.markdown
|
189
|
-
- man/feature-start.1.ronn
|
190
|
-
- man/hotfix-finish.1.html
|
191
|
-
- man/hotfix-merge.1
|
192
|
-
- man/index.txt
|
193
|
-
- man/feature-merge.1.ronn
|
194
105
|
- man/feature-list.1
|
195
|
-
- man/feature-
|
196
|
-
- man/feature-url.1.markdown
|
197
|
-
- man/feature-finish.1
|
198
|
-
- man/feature.1
|
199
|
-
- man/hotfix-finish-issue.1.markdown
|
200
|
-
- man/hotfix-list.1.ronn
|
201
|
-
- man/feature-clean.1.ronn
|
202
|
-
- man/feature-clean.1.markdown
|
106
|
+
- man/feature-list.1.ronn
|
203
107
|
- man/feature-merge.1
|
204
|
-
- man/
|
108
|
+
- man/feature-merge.1.ronn
|
205
109
|
- man/feature-prune.1
|
206
|
-
- man/feature-
|
207
|
-
- man/feature-status.1.ronn
|
110
|
+
- man/feature-prune.1.ronn
|
208
111
|
- man/feature-start.1
|
209
|
-
- man/
|
210
|
-
- man/feature-
|
211
|
-
- man/feature-
|
112
|
+
- man/feature-start.1.ronn
|
113
|
+
- man/feature-stashes.1
|
114
|
+
- man/feature-stashes.1.ronn
|
212
115
|
- man/feature-status.1
|
213
|
-
- man/feature-
|
214
|
-
- man/hotfix-switch.1.markdown
|
215
|
-
- man/feature-status.1.markdown
|
216
|
-
- man/feature-clean.1
|
217
|
-
- man/feature-github-test.1.markdown
|
218
|
-
- man/hotfix-list.1
|
219
|
-
- man/feature-finish-issue.1.markdown
|
220
|
-
- man/feature-switch.1.ronn
|
116
|
+
- man/feature-status.1.ronn
|
221
117
|
- man/feature-switch.1
|
118
|
+
- man/feature-switch.1.ronn
|
119
|
+
- man/feature-url.1
|
120
|
+
- man/feature-url.1.ronn
|
121
|
+
- man/feature.1
|
122
|
+
- man/feature.1.ronn
|
123
|
+
- man/hotfix-finish-issue.1
|
222
124
|
- man/hotfix-finish-issue.1.ronn
|
223
|
-
- man/hotfix-
|
125
|
+
- man/hotfix-finish.1
|
126
|
+
- man/hotfix-finish.1.ronn
|
127
|
+
- man/hotfix-list.1
|
128
|
+
- man/hotfix-list.1.ronn
|
129
|
+
- man/hotfix-merge.1
|
130
|
+
- man/hotfix-merge.1.ronn
|
131
|
+
- man/hotfix-start.1
|
224
132
|
- man/hotfix-start.1.ronn
|
225
|
-
- man/
|
226
|
-
- man/
|
133
|
+
- man/hotfix-switch.1
|
134
|
+
- man/hotfix-switch.1.ronn
|
135
|
+
- man/hotfix-url.1
|
136
|
+
- man/hotfix-url.1.ronn
|
137
|
+
- man/hotfix.1
|
138
|
+
- man/hotfix.1.ronn
|
139
|
+
- man/index.html
|
140
|
+
- man/index.txt
|
227
141
|
homepage: http://ifixit.github.com/git-scripts/
|
228
142
|
licenses: []
|
229
143
|
metadata: {}
|
@@ -233,17 +147,17 @@ require_paths:
|
|
233
147
|
- lib
|
234
148
|
required_ruby_version: !ruby/object:Gem::Requirement
|
235
149
|
requirements:
|
236
|
-
- -
|
150
|
+
- - ">="
|
237
151
|
- !ruby/object:Gem::Version
|
238
152
|
version: '0'
|
239
153
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
240
154
|
requirements:
|
241
|
-
- -
|
155
|
+
- - ">="
|
242
156
|
- !ruby/object:Gem::Version
|
243
157
|
version: '0'
|
244
158
|
requirements: []
|
245
159
|
rubyforge_project:
|
246
|
-
rubygems_version: 2.1
|
160
|
+
rubygems_version: 2.5.1
|
247
161
|
signing_key:
|
248
162
|
specification_version: 4
|
249
163
|
summary: User scripts for managing feature branches and hotfixes.
|
data/man/feature-clean.1
DELETED
@@ -1,31 +0,0 @@
|
|
1
|
-
.\" generated with Ronn/v0.7.3
|
2
|
-
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
3
|
-
.
|
4
|
-
.TH "FEATURE\-CLEAN" "1" "September 2013" "iFixit" ""
|
5
|
-
.
|
6
|
-
.SH "NAME"
|
7
|
-
\fBfeature\-clean\fR \- Remove untracked files and submodules\.
|
8
|
-
.
|
9
|
-
.SH "SYNOPSIS"
|
10
|
-
\fBfeature clean\fR [\-\-all]
|
11
|
-
.
|
12
|
-
.SH "DESCRIPTION"
|
13
|
-
Remove untracked files and submodules\.
|
14
|
-
.
|
15
|
-
.P
|
16
|
-
Compatible with hotfix branches\.
|
17
|
-
.
|
18
|
-
.SH "OPTIONS"
|
19
|
-
.
|
20
|
-
.TP
|
21
|
-
\fB\-\-clean\fR
|
22
|
-
Remove all untracked \.gitignored files as well\.
|
23
|
-
.
|
24
|
-
.SH "COPYRIGHT"
|
25
|
-
Copyright (c) 2012\-2013 iFixit\.
|
26
|
-
.
|
27
|
-
.SH "SEE ALSO"
|
28
|
-
feature(1)
|
29
|
-
.
|
30
|
-
.SH "WWW"
|
31
|
-
https://github\.com/iFixit/git\-scripts
|
data/man/feature-clean.1.html
DELETED
@@ -1,120 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<head>
|
4
|
-
<meta http-equiv='content-type' value='text/html;charset=utf8'>
|
5
|
-
<meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
|
6
|
-
<title>feature-clean(1) - Remove untracked files and submodules.</title>
|
7
|
-
<style type='text/css' media='all'>
|
8
|
-
/* style: man */
|
9
|
-
body#manpage {margin:0}
|
10
|
-
.mp {max-width:100ex;padding:0 9ex 1ex 4ex}
|
11
|
-
.mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
|
12
|
-
.mp h2 {margin:10px 0 0 0}
|
13
|
-
.mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
|
14
|
-
.mp h3 {margin:0 0 0 4ex}
|
15
|
-
.mp dt {margin:0;clear:left}
|
16
|
-
.mp dt.flush {float:left;width:8ex}
|
17
|
-
.mp dd {margin:0 0 0 9ex}
|
18
|
-
.mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
|
19
|
-
.mp pre {margin-bottom:20px}
|
20
|
-
.mp pre+h2,.mp pre+h3 {margin-top:22px}
|
21
|
-
.mp h2+pre,.mp h3+pre {margin-top:5px}
|
22
|
-
.mp img {display:block;margin:auto}
|
23
|
-
.mp h1.man-title {display:none}
|
24
|
-
.mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
|
25
|
-
.mp h2 {font-size:16px;line-height:1.25}
|
26
|
-
.mp h1 {font-size:20px;line-height:2}
|
27
|
-
.mp {text-align:justify;background:#fff}
|
28
|
-
.mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
|
29
|
-
.mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
|
30
|
-
.mp u {text-decoration:underline}
|
31
|
-
.mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
|
32
|
-
.mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
|
33
|
-
.mp a,.mp a:link,.mp a:hover,.mp a code,.mp a pre,.mp a tt,.mp a kbd,.mp a samp {color:#0000ff}
|
34
|
-
.mp b.man-ref {font-weight:normal;color:#434241}
|
35
|
-
.mp pre {padding:0 4ex}
|
36
|
-
.mp pre code {font-weight:normal;color:#434241}
|
37
|
-
.mp h2+pre,h3+pre {padding-left:0}
|
38
|
-
ol.man-decor,ol.man-decor li {margin:3px 0 10px 0;padding:0;float:left;width:33%;list-style-type:none;text-transform:uppercase;color:#999;letter-spacing:1px}
|
39
|
-
ol.man-decor {width:100%}
|
40
|
-
ol.man-decor li.tl {text-align:left}
|
41
|
-
ol.man-decor li.tc {text-align:center;letter-spacing:4px}
|
42
|
-
ol.man-decor li.tr {text-align:right;float:right}
|
43
|
-
</style>
|
44
|
-
<style type='text/css' media='all'>
|
45
|
-
/* style: toc */
|
46
|
-
.man-navigation {display:block !important;position:fixed;top:0;left:113ex;height:100%;width:100%;padding:48px 0 0 0;border-left:1px solid #dbdbdb;background:#eee}
|
47
|
-
.man-navigation a,.man-navigation a:hover,.man-navigation a:link,.man-navigation a:visited {display:block;margin:0;padding:5px 2px 5px 30px;color:#999;text-decoration:none}
|
48
|
-
.man-navigation a:hover {color:#111;text-decoration:underline}
|
49
|
-
</style>
|
50
|
-
</head>
|
51
|
-
<!--
|
52
|
-
The following styles are deprecated and will be removed at some point:
|
53
|
-
div#man, div#man ol.man, div#man ol.head, div#man ol.man.
|
54
|
-
|
55
|
-
The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
|
56
|
-
.man-navigation should be used instead.
|
57
|
-
-->
|
58
|
-
<body id='manpage'>
|
59
|
-
<div class='mp' id='man'>
|
60
|
-
|
61
|
-
<div class='man-navigation' style='display:none'>
|
62
|
-
<a href="#NAME">NAME</a>
|
63
|
-
<a href="#SYNOPSIS">SYNOPSIS</a>
|
64
|
-
<a href="#DESCRIPTION">DESCRIPTION</a>
|
65
|
-
<a href="#OPTIONS">OPTIONS</a>
|
66
|
-
<a href="#COPYRIGHT">COPYRIGHT</a>
|
67
|
-
<a href="#SEE-ALSO">SEE ALSO</a>
|
68
|
-
<a href="#WWW">WWW</a>
|
69
|
-
</div>
|
70
|
-
|
71
|
-
<ol class='man-decor man-head man head'>
|
72
|
-
<li class='tl'>feature-clean(1)</li>
|
73
|
-
<li class='tc'></li>
|
74
|
-
<li class='tr'>feature-clean(1)</li>
|
75
|
-
</ol>
|
76
|
-
|
77
|
-
<h2 id="NAME">NAME</h2>
|
78
|
-
<p class="man-name">
|
79
|
-
<code>feature-clean</code> - <span class="man-whatis">Remove untracked files and submodules.</span>
|
80
|
-
</p>
|
81
|
-
|
82
|
-
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
83
|
-
|
84
|
-
<p><code>feature clean</code> [--all]</p>
|
85
|
-
|
86
|
-
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
87
|
-
|
88
|
-
<p>Remove untracked files and submodules.</p>
|
89
|
-
|
90
|
-
<p>Compatible with hotfix branches.</p>
|
91
|
-
|
92
|
-
<h2 id="OPTIONS">OPTIONS</h2>
|
93
|
-
|
94
|
-
<dl>
|
95
|
-
<dt> <code>--clean</code></dt><dd> Remove all untracked .gitignored files as well.</dd>
|
96
|
-
</dl>
|
97
|
-
|
98
|
-
|
99
|
-
<h2 id="COPYRIGHT">COPYRIGHT</h2>
|
100
|
-
|
101
|
-
<p>Copyright (c) 2012-2013 iFixit.</p>
|
102
|
-
|
103
|
-
<h2 id="SEE-ALSO">SEE ALSO</h2>
|
104
|
-
|
105
|
-
<p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a></p>
|
106
|
-
|
107
|
-
<h2 id="WWW">WWW</h2>
|
108
|
-
|
109
|
-
<p>https://github.com/iFixit/git-scripts</p>
|
110
|
-
|
111
|
-
|
112
|
-
<ol class='man-decor man-foot man foot'>
|
113
|
-
<li class='tl'>iFixit</li>
|
114
|
-
<li class='tc'>May 2014</li>
|
115
|
-
<li class='tr'>feature-clean(1)</li>
|
116
|
-
</ol>
|
117
|
-
|
118
|
-
</div>
|
119
|
-
</body>
|
120
|
-
</html>
|