git-scripts 0.2.0 → 0.3.0
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.
- data/README.md +0 -15
- data/bin/feature +70 -15
- data/bin/hotfix +78 -23
- data/completion/_feature +38 -0
- data/completion/_hotfix +28 -0
- data/{bash_completion.sh → completion/bash_completion.sh} +2 -2
- data/lib/git.rb +59 -13
- data/lib/github.rb +15 -9
- data/lib/helpers.rb +20 -11
- data/man/feature-finish-issue.1 +22 -0
- data/man/feature-finish-issue.1.ronn +26 -0
- data/man/feature-finish.1 +4 -4
- data/man/feature-finish.1.html +7 -12
- data/man/feature-finish.1.ronn +6 -5
- data/man/feature-list.1 +8 -2
- data/man/feature-list.1.html +11 -9
- data/man/feature-list.1.ronn +6 -1
- data/man/feature-merge.1.html +4 -9
- data/man/feature-switch.1 +3 -3
- data/man/feature-switch.1.html +6 -10
- data/man/feature-switch.1.ronn +3 -1
- data/man/{feature-github-test.1.html → feature-url.1.html} +9 -15
- data/man/feature.1.html +3 -7
- data/man/hotfix-finish-issue.1 +22 -0
- data/man/hotfix-finish-issue.1.ronn +26 -0
- data/man/hotfix-finish.1 +2 -2
- data/man/hotfix-finish.1.ronn +1 -1
- data/man/hotfix-list.1 +8 -2
- data/man/hotfix-list.1.html +11 -9
- data/man/hotfix-list.1.ronn +6 -1
- data/man/hotfix-merge.1.html +4 -9
- data/man/hotfix-switch.1 +3 -3
- data/man/hotfix-switch.1.ronn +3 -1
- data/man/{hotfix-start.1.html → hotfix-url.1.html} +9 -15
- data/man/hotfix.1.html +2 -7
- metadata +13 -28
- data/man/feature-clean.1.html +0 -120
- data/man/feature-clean.1.markdown +0 -58
- data/man/feature-finish.1.markdown +0 -52
- data/man/feature-github-test.1.markdown +0 -50
- data/man/feature-list.1.markdown +0 -51
- data/man/feature-merge.1.markdown +0 -55
- data/man/feature-start.1.html +0 -110
- data/man/feature-start.1.markdown +0 -50
- data/man/feature-stashes.1.html +0 -122
- data/man/feature-stashes.1.markdown +0 -60
- data/man/feature-status.1.html +0 -113
- data/man/feature-status.1.markdown +0 -53
- data/man/feature-switch.1.markdown +0 -56
- data/man/feature.1.markdown +0 -75
- data/man/feature.html +0 -140
- data/man/hotfix-finish.1.html +0 -112
- data/man/hotfix-finish.1.markdown +0 -52
- data/man/hotfix-list.1.markdown +0 -51
- data/man/hotfix-merge.1.markdown +0 -55
- data/man/hotfix-start.1.markdown +0 -50
- data/man/hotfix-switch.1.html +0 -110
- data/man/hotfix-switch.1.markdown +0 -50
- data/man/hotfix.1.markdown +0 -65
data/man/feature.html
DELETED
|
@@ -1,140 +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</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
|
-
</head>
|
|
45
|
-
<!--
|
|
46
|
-
The following styles are deprecated and will be removed at some point:
|
|
47
|
-
div#man, div#man ol.man, div#man ol.head, div#man ol.man.
|
|
48
|
-
|
|
49
|
-
The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
|
|
50
|
-
.man-navigation should be used instead.
|
|
51
|
-
-->
|
|
52
|
-
<body id='manpage'>
|
|
53
|
-
<div class='mp' id='man'>
|
|
54
|
-
|
|
55
|
-
<div class='man-navigation' style='display:none'>
|
|
56
|
-
<a href="#NAME">NAME</a>
|
|
57
|
-
</div>
|
|
58
|
-
|
|
59
|
-
<ol class='man-decor man-head man head'>
|
|
60
|
-
<li class='tl'>feature</li>
|
|
61
|
-
<li class='tc'></li>
|
|
62
|
-
<li class='tr'>feature</li>
|
|
63
|
-
</ol>
|
|
64
|
-
|
|
65
|
-
<h2 id="NAME">NAME</h2>
|
|
66
|
-
<p class="man-name">
|
|
67
|
-
<code>feature</code>
|
|
68
|
-
</p>
|
|
69
|
-
<p>.\" generated with Ronn/v0.7.3
|
|
70
|
-
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
|
71
|
-
.
|
|
72
|
-
.TH "FEATURE" "1" "February 2013" "iFixit" ""
|
|
73
|
-
.
|
|
74
|
-
.SH "NAME"
|
|
75
|
-
\fBfeature\fR - Perform actions on a git feature branch.
|
|
76
|
-
.
|
|
77
|
-
.SH "SYNOPSIS"
|
|
78
|
-
\fBfeature\fR \fIcommand\fR [\fIargs\fR]
|
|
79
|
-
.
|
|
80
|
-
.SH "DESCRIPTION"
|
|
81
|
-
\fBFeature\fR is a helper script for a modified git-flow model, in which it and \fBhotfix\fR are the primary actors.
|
|
82
|
-
.
|
|
83
|
-
.SH "COMMANDS"
|
|
84
|
-
.
|
|
85
|
-
.TP
|
|
86
|
-
\<span class="man-ref">fBfeature-list<span class="s">(1)</span></span>\fR
|
|
87
|
-
List the current branch and any available feature branches.
|
|
88
|
-
.
|
|
89
|
-
.TP
|
|
90
|
-
\<span class="man-ref">fBfeature-start<span class="s">(1)</span></span>\fR
|
|
91
|
-
Start a new feature branch.
|
|
92
|
-
.
|
|
93
|
-
.TP
|
|
94
|
-
\<span class="man-ref">fBfeature-switch<span class="s">(1)</span></span>\fR
|
|
95
|
-
Switch to another feature branch.
|
|
96
|
-
.
|
|
97
|
-
.TP
|
|
98
|
-
\<span class="man-ref">fBfeature-finish<span class="s">(1)</span></span>\fR
|
|
99
|
-
Finish this feature branch (push and open a pull request).
|
|
100
|
-
.
|
|
101
|
-
.TP
|
|
102
|
-
\<span class="man-ref">fBfeature-merge<span class="s">(1)</span></span>\fR
|
|
103
|
-
Merge a feature branch into the development branch.
|
|
104
|
-
.
|
|
105
|
-
.TP
|
|
106
|
-
\<span class="man-ref">fBfeature-pull<span class="s">(1)</span></span>\fR
|
|
107
|
-
Pull remote updates into this branch.
|
|
108
|
-
.
|
|
109
|
-
.TP
|
|
110
|
-
\<span class="man-ref">fBfeature-status<span class="s">(1)</span></span>\fR
|
|
111
|
-
Determine if the current branch is up-to-date with the remote branch.
|
|
112
|
-
.
|
|
113
|
-
.TP
|
|
114
|
-
\<span class="man-ref">fBfeature-stashes<span class="s">(1)</span></span>\fR
|
|
115
|
-
Show stashes saved on the current branch.
|
|
116
|
-
.
|
|
117
|
-
.TP
|
|
118
|
-
\<span class="man-ref">fBfeature-clean<span class="s">(1)</span></span>\fR
|
|
119
|
-
Remove untracked files and submodules.
|
|
120
|
-
.
|
|
121
|
-
.TP
|
|
122
|
-
\<span class="man-ref">fBfeature-github-test<span class="s">(1)</span></span>\fR
|
|
123
|
-
Test Github authentication.
|
|
124
|
-
.
|
|
125
|
-
.SH "COPYRIGHT"
|
|
126
|
-
Copyright (c) 2012-2013 iFixit.
|
|
127
|
-
.
|
|
128
|
-
.SH "SEE ALSO"
|
|
129
|
-
<a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="https://www.kernel.org/pub/software/scm/git/docs/">git<span class="s">(1)</span></a></p>
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
<ol class='man-decor man-foot man foot'>
|
|
133
|
-
<li class='tl'></li>
|
|
134
|
-
<li class='tc'>February 2013</li>
|
|
135
|
-
<li class='tr'>feature</li>
|
|
136
|
-
</ol>
|
|
137
|
-
|
|
138
|
-
</div>
|
|
139
|
-
</body>
|
|
140
|
-
</html>
|
data/man/hotfix-finish.1.html
DELETED
|
@@ -1,112 +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>hotfix-finish(1) - Finish this hotfix branch.</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="#COPYRIGHT">COPYRIGHT</a>
|
|
66
|
-
<a href="#SEE-ALSO">SEE ALSO</a>
|
|
67
|
-
<a href="#WWW">WWW</a>
|
|
68
|
-
</div>
|
|
69
|
-
|
|
70
|
-
<ol class='man-decor man-head man head'>
|
|
71
|
-
<li class='tl'>hotfix-finish(1)</li>
|
|
72
|
-
<li class='tc'></li>
|
|
73
|
-
<li class='tr'>hotfix-finish(1)</li>
|
|
74
|
-
</ol>
|
|
75
|
-
|
|
76
|
-
<h2 id="NAME">NAME</h2>
|
|
77
|
-
<p class="man-name">
|
|
78
|
-
<code>hotfix-finish</code> - <span class="man-whatis">Finish this hotfix branch.</span>
|
|
79
|
-
</p>
|
|
80
|
-
|
|
81
|
-
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
|
82
|
-
|
|
83
|
-
<p><code>hotfix finish</code> <var>name-of-hotfix</var></p>
|
|
84
|
-
|
|
85
|
-
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
|
86
|
-
|
|
87
|
-
<p>Finish the current hotfix branch. Push all remote commits to the remote and
|
|
88
|
-
optionally open a pull request. If a pull request is opened, the message will
|
|
89
|
-
default to the commit message from the last commit on the branch.</p>
|
|
90
|
-
|
|
91
|
-
<h2 id="COPYRIGHT">COPYRIGHT</h2>
|
|
92
|
-
|
|
93
|
-
<p>Copyright (c) 2012-2013 iFixit.</p>
|
|
94
|
-
|
|
95
|
-
<h2 id="SEE-ALSO">SEE ALSO</h2>
|
|
96
|
-
|
|
97
|
-
<p><a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="feature-finish.1.html">feature-finish<span class="s">(1)</span></a></p>
|
|
98
|
-
|
|
99
|
-
<h2 id="WWW">WWW</h2>
|
|
100
|
-
|
|
101
|
-
<p>https://github.com/iFixit/git-scripts</p>
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
<ol class='man-decor man-foot man foot'>
|
|
105
|
-
<li class='tl'>iFixit</li>
|
|
106
|
-
<li class='tc'>April 2013</li>
|
|
107
|
-
<li class='tr'>hotfix-finish(1)</li>
|
|
108
|
-
</ol>
|
|
109
|
-
|
|
110
|
-
</div>
|
|
111
|
-
</body>
|
|
112
|
-
</html>
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
hotfix-finish(1) - Finish this hotfix branch.
|
|
2
|
-
=============================================
|
|
3
|
-
|
|
4
|
-
## SYNOPSIS
|
|
5
|
-
|
|
6
|
-
`hotfix finish` <var>name-of-hotfix</var>
|
|
7
|
-
|
|
8
|
-
## DESCRIPTION
|
|
9
|
-
|
|
10
|
-
Finish the current hotfix branch. Push all remote commits to the remote and
|
|
11
|
-
optionally open a pull request. If a pull request is opened, the message will
|
|
12
|
-
default to the commit message from the last commit on the branch.
|
|
13
|
-
|
|
14
|
-
## COPYRIGHT
|
|
15
|
-
|
|
16
|
-
Copyright (c) 2012-2013 iFixit.
|
|
17
|
-
|
|
18
|
-
## SEE ALSO
|
|
19
|
-
|
|
20
|
-
hotfix(1), feature-finish(1)
|
|
21
|
-
|
|
22
|
-
## WWW
|
|
23
|
-
|
|
24
|
-
https://github.com/iFixit/git-scripts
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
|
|
29
|
-
[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
|
|
30
|
-
[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
|
|
31
|
-
[SEE ALSO]: #SEE-ALSO "SEE ALSO"
|
|
32
|
-
[WWW]: #WWW "WWW"
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
[feature(1)]: feature.1.html
|
|
36
|
-
[feature-list(1)]: feature-list.1.html
|
|
37
|
-
[feature-start(1)]: feature-start.1.html
|
|
38
|
-
[feature-switch(1)]: feature-switch.1.html
|
|
39
|
-
[feature-finish(1)]: feature-finish.1.html
|
|
40
|
-
[feature-merge(1)]: feature-merge.1.html
|
|
41
|
-
[feature-pull(1)]: feature-pull.1.html
|
|
42
|
-
[feature-status(1)]: feature-status.1.html
|
|
43
|
-
[feature-stashes(1)]: feature-stashes.1.html
|
|
44
|
-
[feature-clean(1)]: feature-clean.1.html
|
|
45
|
-
[feature-github-test(1)]: feature-github-test.1.html
|
|
46
|
-
[hotfix(1)]: hotfix.1.html
|
|
47
|
-
[hotfix-list(1)]: hotfix-list.1.html
|
|
48
|
-
[hotfix-start(1)]: hotfix-start.1.html
|
|
49
|
-
[hotfix-switch(1)]: hotfix-switch.1.html
|
|
50
|
-
[hotfix-finish(1)]: hotfix-finish.1.html
|
|
51
|
-
[hotfix-merge(1)]: hotfix-merge.1.html
|
|
52
|
-
[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
|
data/man/hotfix-list.1.markdown
DELETED
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
hotfix-list(1) - Lists the current branch and any available hotfix branches.
|
|
2
|
-
==============================================================================
|
|
3
|
-
|
|
4
|
-
## SYNOPSIS
|
|
5
|
-
|
|
6
|
-
`hotfix list`
|
|
7
|
-
|
|
8
|
-
## DESCRIPTION
|
|
9
|
-
|
|
10
|
-
Lists the current branch and any available hotfix branches. Shows the author,
|
|
11
|
-
hash, and relative time of last commit on each branch.
|
|
12
|
-
|
|
13
|
-
## COPYRIGHT
|
|
14
|
-
|
|
15
|
-
Copyright (c) 2012-2013 iFixit.
|
|
16
|
-
|
|
17
|
-
## SEE ALSO
|
|
18
|
-
|
|
19
|
-
hotfix(1), feature-list(1)
|
|
20
|
-
|
|
21
|
-
## WWW
|
|
22
|
-
|
|
23
|
-
https://github.com/iFixit/git-scripts
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
|
|
28
|
-
[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
|
|
29
|
-
[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
|
|
30
|
-
[SEE ALSO]: #SEE-ALSO "SEE ALSO"
|
|
31
|
-
[WWW]: #WWW "WWW"
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
[feature(1)]: feature.1.html
|
|
35
|
-
[feature-list(1)]: feature-list.1.html
|
|
36
|
-
[feature-start(1)]: feature-start.1.html
|
|
37
|
-
[feature-switch(1)]: feature-switch.1.html
|
|
38
|
-
[feature-finish(1)]: feature-finish.1.html
|
|
39
|
-
[feature-merge(1)]: feature-merge.1.html
|
|
40
|
-
[feature-pull(1)]: feature-pull.1.html
|
|
41
|
-
[feature-status(1)]: feature-status.1.html
|
|
42
|
-
[feature-stashes(1)]: feature-stashes.1.html
|
|
43
|
-
[feature-clean(1)]: feature-clean.1.html
|
|
44
|
-
[feature-github-test(1)]: feature-github-test.1.html
|
|
45
|
-
[hotfix(1)]: hotfix.1.html
|
|
46
|
-
[hotfix-list(1)]: hotfix-list.1.html
|
|
47
|
-
[hotfix-start(1)]: hotfix-start.1.html
|
|
48
|
-
[hotfix-switch(1)]: hotfix-switch.1.html
|
|
49
|
-
[hotfix-finish(1)]: hotfix-finish.1.html
|
|
50
|
-
[hotfix-merge(1)]: hotfix-merge.1.html
|
|
51
|
-
[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
|
data/man/hotfix-merge.1.markdown
DELETED
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
hotfix-merge(1) - Merge a hotfix branch into stable and the development branch.
|
|
2
|
-
===============================================================================
|
|
3
|
-
|
|
4
|
-
## SYNOPSIS
|
|
5
|
-
|
|
6
|
-
`hotfix merge` [name-of-hotfix]
|
|
7
|
-
|
|
8
|
-
## DESCRIPTION
|
|
9
|
-
|
|
10
|
-
Merge a hotfix branch into stable and _feature.development_branch_. If
|
|
11
|
-
`name-of-hotfix` is not specified, the current branch will be used. `hotfix
|
|
12
|
-
merge` will attempt to prefill the merge message with a link to and the text of
|
|
13
|
-
the pull request associated with the branch.
|
|
14
|
-
|
|
15
|
-
Deletes the local copy of the branch on success.
|
|
16
|
-
|
|
17
|
-
## COPYRIGHT
|
|
18
|
-
|
|
19
|
-
Copyright (c) 2012-2013 iFixit.
|
|
20
|
-
|
|
21
|
-
## SEE ALSO
|
|
22
|
-
|
|
23
|
-
hotfix(1), feature-merge(1)
|
|
24
|
-
|
|
25
|
-
## WWW
|
|
26
|
-
|
|
27
|
-
https://github.com/iFixit/git-scripts
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
|
|
32
|
-
[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
|
|
33
|
-
[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
|
|
34
|
-
[SEE ALSO]: #SEE-ALSO "SEE ALSO"
|
|
35
|
-
[WWW]: #WWW "WWW"
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
[feature(1)]: feature.1.html
|
|
39
|
-
[feature-list(1)]: feature-list.1.html
|
|
40
|
-
[feature-start(1)]: feature-start.1.html
|
|
41
|
-
[feature-switch(1)]: feature-switch.1.html
|
|
42
|
-
[feature-finish(1)]: feature-finish.1.html
|
|
43
|
-
[feature-merge(1)]: feature-merge.1.html
|
|
44
|
-
[feature-pull(1)]: feature-pull.1.html
|
|
45
|
-
[feature-status(1)]: feature-status.1.html
|
|
46
|
-
[feature-stashes(1)]: feature-stashes.1.html
|
|
47
|
-
[feature-clean(1)]: feature-clean.1.html
|
|
48
|
-
[feature-github-test(1)]: feature-github-test.1.html
|
|
49
|
-
[hotfix(1)]: hotfix.1.html
|
|
50
|
-
[hotfix-list(1)]: hotfix-list.1.html
|
|
51
|
-
[hotfix-start(1)]: hotfix-start.1.html
|
|
52
|
-
[hotfix-switch(1)]: hotfix-switch.1.html
|
|
53
|
-
[hotfix-finish(1)]: hotfix-finish.1.html
|
|
54
|
-
[hotfix-merge(1)]: hotfix-merge.1.html
|
|
55
|
-
[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
|
data/man/hotfix-start.1.markdown
DELETED
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
hotfix-start(1) - Start a new hotfix branch.
|
|
2
|
-
============================================
|
|
3
|
-
|
|
4
|
-
## SYNOPSIS
|
|
5
|
-
|
|
6
|
-
`hotfix start` <var>name-of-hotfix</var>
|
|
7
|
-
|
|
8
|
-
## DESCRIPTION
|
|
9
|
-
|
|
10
|
-
Start a new hotfix branch based off stable.
|
|
11
|
-
|
|
12
|
-
## COPYRIGHT
|
|
13
|
-
|
|
14
|
-
Copyright (c) 2012-2013 iFixit.
|
|
15
|
-
|
|
16
|
-
## SEE ALSO
|
|
17
|
-
|
|
18
|
-
hotfix(1), feature-start(1)
|
|
19
|
-
|
|
20
|
-
## WWW
|
|
21
|
-
|
|
22
|
-
https://github.com/iFixit/git-scripts
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
|
|
27
|
-
[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
|
|
28
|
-
[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
|
|
29
|
-
[SEE ALSO]: #SEE-ALSO "SEE ALSO"
|
|
30
|
-
[WWW]: #WWW "WWW"
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
[feature(1)]: feature.1.html
|
|
34
|
-
[feature-list(1)]: feature-list.1.html
|
|
35
|
-
[feature-start(1)]: feature-start.1.html
|
|
36
|
-
[feature-switch(1)]: feature-switch.1.html
|
|
37
|
-
[feature-finish(1)]: feature-finish.1.html
|
|
38
|
-
[feature-merge(1)]: feature-merge.1.html
|
|
39
|
-
[feature-pull(1)]: feature-pull.1.html
|
|
40
|
-
[feature-status(1)]: feature-status.1.html
|
|
41
|
-
[feature-stashes(1)]: feature-stashes.1.html
|
|
42
|
-
[feature-clean(1)]: feature-clean.1.html
|
|
43
|
-
[feature-github-test(1)]: feature-github-test.1.html
|
|
44
|
-
[hotfix(1)]: hotfix.1.html
|
|
45
|
-
[hotfix-list(1)]: hotfix-list.1.html
|
|
46
|
-
[hotfix-start(1)]: hotfix-start.1.html
|
|
47
|
-
[hotfix-switch(1)]: hotfix-switch.1.html
|
|
48
|
-
[hotfix-finish(1)]: hotfix-finish.1.html
|
|
49
|
-
[hotfix-merge(1)]: hotfix-merge.1.html
|
|
50
|
-
[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
|
data/man/hotfix-switch.1.html
DELETED
|
@@ -1,110 +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>hotfix-switch(1) - Switch to another hotfix branch.</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="#COPYRIGHT">COPYRIGHT</a>
|
|
66
|
-
<a href="#SEE-ALSO">SEE ALSO</a>
|
|
67
|
-
<a href="#WWW">WWW</a>
|
|
68
|
-
</div>
|
|
69
|
-
|
|
70
|
-
<ol class='man-decor man-head man head'>
|
|
71
|
-
<li class='tl'>hotfix-switch(1)</li>
|
|
72
|
-
<li class='tc'></li>
|
|
73
|
-
<li class='tr'>hotfix-switch(1)</li>
|
|
74
|
-
</ol>
|
|
75
|
-
|
|
76
|
-
<h2 id="NAME">NAME</h2>
|
|
77
|
-
<p class="man-name">
|
|
78
|
-
<code>hotfix-switch</code> - <span class="man-whatis">Switch to another hotfix branch.</span>
|
|
79
|
-
</p>
|
|
80
|
-
|
|
81
|
-
<h2 id="SYNOPSIS">SYNOPSIS</h2>
|
|
82
|
-
|
|
83
|
-
<p><code>hotfix switch</code> <var>name-of-hotfix</var></p>
|
|
84
|
-
|
|
85
|
-
<h2 id="DESCRIPTION">DESCRIPTION</h2>
|
|
86
|
-
|
|
87
|
-
<p>Switch to the <var>name-of-hotfix</var> branch.</p>
|
|
88
|
-
|
|
89
|
-
<h2 id="COPYRIGHT">COPYRIGHT</h2>
|
|
90
|
-
|
|
91
|
-
<p>Copyright (c) 2012-2013 iFixit.</p>
|
|
92
|
-
|
|
93
|
-
<h2 id="SEE-ALSO">SEE ALSO</h2>
|
|
94
|
-
|
|
95
|
-
<p><a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="feature-switch.1.html">feature-switch<span class="s">(1)</span></a></p>
|
|
96
|
-
|
|
97
|
-
<h2 id="WWW">WWW</h2>
|
|
98
|
-
|
|
99
|
-
<p>https://github.com/iFixit/git-scripts</p>
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
<ol class='man-decor man-foot man foot'>
|
|
103
|
-
<li class='tl'>iFixit</li>
|
|
104
|
-
<li class='tc'>April 2013</li>
|
|
105
|
-
<li class='tr'>hotfix-switch(1)</li>
|
|
106
|
-
</ol>
|
|
107
|
-
|
|
108
|
-
</div>
|
|
109
|
-
</body>
|
|
110
|
-
</html>
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
hotfix-switch(1) - Switch to another hotfix branch.
|
|
2
|
-
===================================================
|
|
3
|
-
|
|
4
|
-
## SYNOPSIS
|
|
5
|
-
|
|
6
|
-
`hotfix switch` <var>name-of-hotfix</var>
|
|
7
|
-
|
|
8
|
-
## DESCRIPTION
|
|
9
|
-
|
|
10
|
-
Switch to the <var>name-of-hotfix</var> branch.
|
|
11
|
-
|
|
12
|
-
## COPYRIGHT
|
|
13
|
-
|
|
14
|
-
Copyright (c) 2012-2013 iFixit.
|
|
15
|
-
|
|
16
|
-
## SEE ALSO
|
|
17
|
-
|
|
18
|
-
hotfix(1), feature-switch(1)
|
|
19
|
-
|
|
20
|
-
## WWW
|
|
21
|
-
|
|
22
|
-
https://github.com/iFixit/git-scripts
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
|
|
27
|
-
[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
|
|
28
|
-
[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
|
|
29
|
-
[SEE ALSO]: #SEE-ALSO "SEE ALSO"
|
|
30
|
-
[WWW]: #WWW "WWW"
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
[feature(1)]: feature.1.html
|
|
34
|
-
[feature-list(1)]: feature-list.1.html
|
|
35
|
-
[feature-start(1)]: feature-start.1.html
|
|
36
|
-
[feature-switch(1)]: feature-switch.1.html
|
|
37
|
-
[feature-finish(1)]: feature-finish.1.html
|
|
38
|
-
[feature-merge(1)]: feature-merge.1.html
|
|
39
|
-
[feature-pull(1)]: feature-pull.1.html
|
|
40
|
-
[feature-status(1)]: feature-status.1.html
|
|
41
|
-
[feature-stashes(1)]: feature-stashes.1.html
|
|
42
|
-
[feature-clean(1)]: feature-clean.1.html
|
|
43
|
-
[feature-github-test(1)]: feature-github-test.1.html
|
|
44
|
-
[hotfix(1)]: hotfix.1.html
|
|
45
|
-
[hotfix-list(1)]: hotfix-list.1.html
|
|
46
|
-
[hotfix-start(1)]: hotfix-start.1.html
|
|
47
|
-
[hotfix-switch(1)]: hotfix-switch.1.html
|
|
48
|
-
[hotfix-finish(1)]: hotfix-finish.1.html
|
|
49
|
-
[hotfix-merge(1)]: hotfix-merge.1.html
|
|
50
|
-
[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
|
data/man/hotfix.1.markdown
DELETED
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
hotfix(1) - Perform actions on a git hotfix branch.
|
|
2
|
-
===================================================
|
|
3
|
-
|
|
4
|
-
## SYNOPSIS
|
|
5
|
-
|
|
6
|
-
`hotfix` <var>command</var> [<var>args</var>]
|
|
7
|
-
|
|
8
|
-
## DESCRIPTION
|
|
9
|
-
|
|
10
|
-
**hotfix** is a helper script for a modified git-flow model, in which it and
|
|
11
|
-
`feature` are the primary actors.
|
|
12
|
-
|
|
13
|
-
## COMMANDS
|
|
14
|
-
|
|
15
|
-
* hotfix-list(1):
|
|
16
|
-
List the current branch and any available hotfix branches.
|
|
17
|
-
* hotfix-start(1):
|
|
18
|
-
Start a new hotfix branch.
|
|
19
|
-
* hotfix-switch(1):
|
|
20
|
-
Switch to another hotfix branch.
|
|
21
|
-
* hotfix-finish(1):
|
|
22
|
-
Finish this hotfix branch (push and open a pull request).
|
|
23
|
-
* hotfix-merge(1):
|
|
24
|
-
Merge a hotfix branch into stable and the development branch.
|
|
25
|
-
|
|
26
|
-
## COPYRIGHT
|
|
27
|
-
|
|
28
|
-
Copyright (c) 2012-2013 iFixit.
|
|
29
|
-
|
|
30
|
-
## SEE ALSO
|
|
31
|
-
|
|
32
|
-
feature(1), git(1)
|
|
33
|
-
|
|
34
|
-
## WWW
|
|
35
|
-
|
|
36
|
-
https://github.com/iFixit/git-scripts
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
|
|
41
|
-
[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
|
|
42
|
-
[COMMANDS]: #COMMANDS "COMMANDS"
|
|
43
|
-
[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
|
|
44
|
-
[SEE ALSO]: #SEE-ALSO "SEE ALSO"
|
|
45
|
-
[WWW]: #WWW "WWW"
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
[feature(1)]: feature.1.html
|
|
49
|
-
[feature-list(1)]: feature-list.1.html
|
|
50
|
-
[feature-start(1)]: feature-start.1.html
|
|
51
|
-
[feature-switch(1)]: feature-switch.1.html
|
|
52
|
-
[feature-finish(1)]: feature-finish.1.html
|
|
53
|
-
[feature-merge(1)]: feature-merge.1.html
|
|
54
|
-
[feature-pull(1)]: feature-pull.1.html
|
|
55
|
-
[feature-status(1)]: feature-status.1.html
|
|
56
|
-
[feature-stashes(1)]: feature-stashes.1.html
|
|
57
|
-
[feature-clean(1)]: feature-clean.1.html
|
|
58
|
-
[feature-github-test(1)]: feature-github-test.1.html
|
|
59
|
-
[hotfix(1)]: hotfix.1.html
|
|
60
|
-
[hotfix-list(1)]: hotfix-list.1.html
|
|
61
|
-
[hotfix-start(1)]: hotfix-start.1.html
|
|
62
|
-
[hotfix-switch(1)]: hotfix-switch.1.html
|
|
63
|
-
[hotfix-finish(1)]: hotfix-finish.1.html
|
|
64
|
-
[hotfix-merge(1)]: hotfix-merge.1.html
|
|
65
|
-
[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
|