git-scripts 0.5.0 → 0.5.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.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/man/feature-clean.1.html +120 -0
  3. data/man/feature-clean.1.markdown +63 -0
  4. data/man/feature-finish-issue.1.html +113 -0
  5. data/man/feature-finish-issue.1.markdown +58 -0
  6. data/man/feature-finish.1.html +113 -0
  7. data/man/feature-finish.1.markdown +58 -0
  8. data/man/feature-github-test.1.html +110 -0
  9. data/man/feature-github-test.1.markdown +55 -0
  10. data/man/feature-list.1.html +119 -0
  11. data/man/feature-list.1.markdown +62 -0
  12. data/man/feature-merge.1.html +116 -0
  13. data/man/feature-merge.1.markdown +61 -0
  14. data/man/feature-prune.1.html +116 -0
  15. data/man/feature-prune.1.markdown +62 -0
  16. data/man/feature-start.1.html +110 -0
  17. data/man/feature-start.1.markdown +55 -0
  18. data/man/feature-stashes.1.html +122 -0
  19. data/man/feature-stashes.1.markdown +65 -0
  20. data/man/feature-status.1.html +113 -0
  21. data/man/feature-status.1.markdown +58 -0
  22. data/man/feature-switch.1.html +122 -0
  23. data/man/feature-switch.1.markdown +66 -0
  24. data/man/feature-url.1.html +110 -0
  25. data/man/feature-url.1.markdown +55 -0
  26. data/man/feature.1.html +131 -0
  27. data/man/feature.1.markdown +86 -0
  28. data/man/hotfix-finish-issue.1.html +113 -0
  29. data/man/hotfix-finish-issue.1.markdown +58 -0
  30. data/man/hotfix-finish.1.html +112 -0
  31. data/man/hotfix-finish.1.markdown +57 -0
  32. data/man/hotfix-list.1.html +119 -0
  33. data/man/hotfix-list.1.markdown +62 -0
  34. data/man/hotfix-merge.1.html +116 -0
  35. data/man/hotfix-merge.1.markdown +61 -0
  36. data/man/hotfix-start.1.html +110 -0
  37. data/man/hotfix-start.1.markdown +55 -0
  38. data/man/hotfix-switch.1.html +122 -0
  39. data/man/hotfix-switch.1.markdown +66 -0
  40. data/man/hotfix-url.1.html +110 -0
  41. data/man/hotfix-url.1.markdown +55 -0
  42. data/man/hotfix.1.html +125 -0
  43. data/man/hotfix.1.markdown +74 -0
  44. metadata +104 -6
data/man/hotfix-finish.1.html ADDED
@@ -0,0 +1,112 @@
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="hotfix-finish-issue.1.html">hotfix-finish-issue<span class="s">(1)</span></a>, <a class="man-ref" href="feature-finish.1.html">feature-finish<span class="s">(1)</span></a>, <a class="man-ref" href="feature-finish-issue.1.html">feature-finish-issue<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'>May 2014</li>
107
+ <li class='tr'>hotfix-finish(1)</li>
108
+ </ol>
109
+
110
+ </div>
111
+ </body>
112
+ </html>
data/man/hotfix-finish.1.markdown ADDED
@@ -0,0 +1,57 @@
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), hotfix-finish-issue(1), feature-finish(1), feature-finish-issue(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/
53
+ [feature-finish-issue(1)]: feature-finish-issue.1.html
54
+ [feature-prune(1)]: feature-prune.1.html
55
+ [feature-url(1)]: feature-url.1.html
56
+ [hotfix-finish-issue(1)]: hotfix-finish-issue.1.html
57
+ [hotfix-url(1)]: hotfix-url.1.html
data/man/hotfix-list.1.html ADDED
@@ -0,0 +1,119 @@
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-list(1) - Lists the current branch and any available hotfix branches.</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'>hotfix-list(1)</li>
73
+ <li class='tc'></li>
74
+ <li class='tr'>hotfix-list(1)</li>
75
+ </ol>
76
+
77
+ <h2 id="NAME">NAME</h2>
78
+ <p class="man-name">
79
+ <code>hotfix-list</code> - <span class="man-whatis">Lists the current branch and any available hotfix branches.</span>
80
+ </p>
81
+
82
+ <h2 id="SYNOPSIS">SYNOPSIS</h2>
83
+
84
+ <p><code>hotfix list</code> [-v]</p>
85
+
86
+ <h2 id="DESCRIPTION">DESCRIPTION</h2>
87
+
88
+ <p>Lists the current branch and any available hotfix branches. Shows the author,
89
+ hash, and relative time of last commit on each branch.</p>
90
+
91
+ <h2 id="OPTIONS">OPTIONS</h2>
92
+
93
+ <dl>
94
+ <dt class="flush"> -v</dt><dd> List merged branches.</dd>
95
+ </dl>
96
+
97
+
98
+ <h2 id="COPYRIGHT">COPYRIGHT</h2>
99
+
100
+ <p>Copyright (c) 2012-2013 iFixit.</p>
101
+
102
+ <h2 id="SEE-ALSO">SEE ALSO</h2>
103
+
104
+ <p><a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="feature-list.1.html">feature-list<span class="s">(1)</span></a></p>
105
+
106
+ <h2 id="WWW">WWW</h2>
107
+
108
+ <p>https://github.com/iFixit/git-scripts</p>
109
+
110
+
111
+ <ol class='man-decor man-foot man foot'>
112
+ <li class='tl'>iFixit</li>
113
+ <li class='tc'>May 2014</li>
114
+ <li class='tr'>hotfix-list(1)</li>
115
+ </ol>
116
+
117
+ </div>
118
+ </body>
119
+ </html>
data/man/hotfix-list.1.markdown ADDED
@@ -0,0 +1,62 @@
1
+ hotfix-list(1) - Lists the current branch and any available hotfix branches.
2
+ ==============================================================================
3
+
4
+ ## SYNOPSIS
5
+
6
+ `hotfix list` [-v]
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
+ ## OPTIONS
14
+
15
+ * -v:
16
+ List merged branches.
17
+
18
+ ## COPYRIGHT
19
+
20
+ Copyright (c) 2012-2013 iFixit.
21
+
22
+ ## SEE ALSO
23
+
24
+ hotfix(1), feature-list(1)
25
+
26
+ ## WWW
27
+
28
+ https://github.com/iFixit/git-scripts
29
+
30
+
31
+
32
+ [SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
33
+ [DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
34
+ [OPTIONS]: #OPTIONS "OPTIONS"
35
+ [COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
36
+ [SEE ALSO]: #SEE-ALSO "SEE ALSO"
37
+ [WWW]: #WWW "WWW"
38
+
39
+
40
+ [feature(1)]: feature.1.html
41
+ [feature-list(1)]: feature-list.1.html
42
+ [feature-start(1)]: feature-start.1.html
43
+ [feature-switch(1)]: feature-switch.1.html
44
+ [feature-finish(1)]: feature-finish.1.html
45
+ [feature-merge(1)]: feature-merge.1.html
46
+ [feature-pull(1)]: feature-pull.1.html
47
+ [feature-status(1)]: feature-status.1.html
48
+ [feature-stashes(1)]: feature-stashes.1.html
49
+ [feature-clean(1)]: feature-clean.1.html
50
+ [feature-github-test(1)]: feature-github-test.1.html
51
+ [hotfix(1)]: hotfix.1.html
52
+ [hotfix-list(1)]: hotfix-list.1.html
53
+ [hotfix-start(1)]: hotfix-start.1.html
54
+ [hotfix-switch(1)]: hotfix-switch.1.html
55
+ [hotfix-finish(1)]: hotfix-finish.1.html
56
+ [hotfix-merge(1)]: hotfix-merge.1.html
57
+ [git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
58
+ [feature-finish-issue(1)]: feature-finish-issue.1.html
59
+ [feature-prune(1)]: feature-prune.1.html
60
+ [feature-url(1)]: feature-url.1.html
61
+ [hotfix-finish-issue(1)]: hotfix-finish-issue.1.html
62
+ [hotfix-url(1)]: hotfix-url.1.html
data/man/hotfix-merge.1.html ADDED
@@ -0,0 +1,116 @@
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-merge(1) - Merge a hotfix branch into stable and the development 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-merge(1)</li>
72
+ <li class='tc'></li>
73
+ <li class='tr'>hotfix-merge(1)</li>
74
+ </ol>
75
+
76
+ <h2 id="NAME">NAME</h2>
77
+ <p class="man-name">
78
+ <code>hotfix-merge</code> - <span class="man-whatis">Merge a hotfix branch into stable and the development branch.</span>
79
+ </p>
80
+
81
+ <h2 id="SYNOPSIS">SYNOPSIS</h2>
82
+
83
+ <p><code>hotfix merge</code> [name-of-hotfix]
84
+ <code>hotfix merge</code> -n <var>number-of-pull</var></p>
85
+
86
+ <h2 id="DESCRIPTION">DESCRIPTION</h2>
87
+
88
+ <p>Merge a hotfix branch into stable and <em>feature.development_branch</em>. If
89
+ <code>name-of-hotfix</code> is not specified, the current branch will be used. <code>hotfix
90
+ merge</code> will attempt to prefill the merge message with a link to and the text of
91
+ the pull request associated with the branch.</p>
92
+
93
+ <p>Deletes the local copy of the branch on success.</p>
94
+
95
+ <h2 id="COPYRIGHT">COPYRIGHT</h2>
96
+
97
+ <p>Copyright (c) 2012-2013 iFixit.</p>
98
+
99
+ <h2 id="SEE-ALSO">SEE ALSO</h2>
100
+
101
+ <p><a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="feature-merge.1.html">feature-merge<span class="s">(1)</span></a></p>
102
+
103
+ <h2 id="WWW">WWW</h2>
104
+
105
+ <p>https://github.com/iFixit/git-scripts</p>
106
+
107
+
108
+ <ol class='man-decor man-foot man foot'>
109
+ <li class='tl'>iFixit</li>
110
+ <li class='tc'>May 2014</li>
111
+ <li class='tr'>hotfix-merge(1)</li>
112
+ </ol>
113
+
114
+ </div>
115
+ </body>
116
+ </html>