git-scripts 0.3.0 → 0.4.0

data/man/hotfix-finish.1.markdown

@@ -0,0 +1,55 @@
+hotfix-finish(1) - Finish this hotfix branch.
+=============================================
+
+## SYNOPSIS
+
+`hotfix finish` <var>name-of-hotfix</var>
+
+## DESCRIPTION
+
+Finish the current hotfix branch.  Push all remote commits to the remote and
+optionally open a pull request.  If a pull request is opened, the message will
+default to the commit message from the last commit on the branch.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+hotfix(1), hotfix-finish-issue(1), feature-finish(1), feature-finish-issue(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+
+
+
+[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
+[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
+[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
+[SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
+
+
+[feature(1)]: feature.1.html
+[feature-list(1)]: feature-list.1.html
+[feature-start(1)]: feature-start.1.html
+[feature-switch(1)]: feature-switch.1.html
+[feature-finish(1)]: feature-finish.1.html
+[feature-merge(1)]: feature-merge.1.html
+[feature-pull(1)]: feature-pull.1.html
+[feature-status(1)]: feature-status.1.html
+[feature-stashes(1)]: feature-stashes.1.html
+[feature-clean(1)]: feature-clean.1.html
+[feature-github-test(1)]: feature-github-test.1.html
+[hotfix(1)]: hotfix.1.html
+[hotfix-list(1)]: hotfix-list.1.html
+[hotfix-start(1)]: hotfix-start.1.html
+[hotfix-switch(1)]: hotfix-switch.1.html
+[hotfix-finish(1)]: hotfix-finish.1.html
+[hotfix-merge(1)]: hotfix-merge.1.html
+[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
+[feature-finish-issue(1)]: feature-finish-issue.1.html
+[feature-prune(1)]: feature-prune.1.html
+[hotfix-finish-issue(1)]: hotfix-finish-issue.1.html

data/man/hotfix-list.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-LIST" "1" "July 2013" "" ""
+.TH "HOTFIX\-LIST" "1" "September 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-list\fR \- Lists the current branch and any available hotfix branches\.

data/man/hotfix-list.1.html

@@ -41,6 +41,12 @@
   ol.man-decor li.tc {text-align:center;letter-spacing:4px}
   ol.man-decor li.tr {text-align:right;float:right}
   </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .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}
+  .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}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
+  </style>
 </head>
 <!--
   The following styles are deprecated and will be removed at some point:
@@ -103,8 +109,8 @@ hash, and relative time of last commit on each branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'></li>
-    <li class='tc'>July 2013</li>
+    <li class='tl'>iFixit</li>
+    <li class='tc'>September 2013</li>
     <li class='tr'>hotfix-list(1)</li>
   </ol>
 

data/man/hotfix-list.1.markdown

@@ -0,0 +1,60 @@
+hotfix-list(1) - Lists the current branch and any available hotfix branches.
+==============================================================================
+
+## SYNOPSIS
+
+`hotfix list` [-v]
+
+## DESCRIPTION
+
+Lists the current branch and any available hotfix branches.  Shows the author,
+hash, and relative time of last commit on each branch.
+
+## OPTIONS
+
+   * -v:
+      List merged branches.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+hotfix(1), feature-list(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+
+
+
+[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
+[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
+[OPTIONS]: #OPTIONS "OPTIONS"
+[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
+[SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
+
+
+[feature(1)]: feature.1.html
+[feature-list(1)]: feature-list.1.html
+[feature-start(1)]: feature-start.1.html
+[feature-switch(1)]: feature-switch.1.html
+[feature-finish(1)]: feature-finish.1.html
+[feature-merge(1)]: feature-merge.1.html
+[feature-pull(1)]: feature-pull.1.html
+[feature-status(1)]: feature-status.1.html
+[feature-stashes(1)]: feature-stashes.1.html
+[feature-clean(1)]: feature-clean.1.html
+[feature-github-test(1)]: feature-github-test.1.html
+[hotfix(1)]: hotfix.1.html
+[hotfix-list(1)]: hotfix-list.1.html
+[hotfix-start(1)]: hotfix-start.1.html
+[hotfix-switch(1)]: hotfix-switch.1.html
+[hotfix-finish(1)]: hotfix-finish.1.html
+[hotfix-merge(1)]: hotfix-merge.1.html
+[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
+[feature-finish-issue(1)]: feature-finish-issue.1.html
+[feature-prune(1)]: feature-prune.1.html
+[hotfix-finish-issue(1)]: hotfix-finish-issue.1.html

data/man/hotfix-merge.1

@@ -1,13 +1,13 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-MERGE" "1" "April 2013" "iFixit" ""
+.TH "HOTFIX\-MERGE" "1" "September 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-merge\fR \- Merge a hotfix branch into stable and the development branch\.
 .
 .SH "SYNOPSIS"
-\fBhotfix merge\fR [name\-of\-hotfix]
+\fBhotfix merge\fR [name\-of\-hotfix] \fBhotfix merge\fR \-n \fInumber\-of\-pull\fR
 .
 .SH "DESCRIPTION"
 Merge a hotfix branch into stable and \fIfeature\.development_branch\fR\. If \fBname\-of\-hotfix\fR is not specified, the current branch will be used\. \fBhotfix merge\fR will attempt to prefill the merge message with a link to and the text of the pull request associated with the branch\.

data/man/hotfix-merge.1.html

@@ -41,6 +41,12 @@
   ol.man-decor li.tc {text-align:center;letter-spacing:4px}
   ol.man-decor li.tr {text-align:right;float:right}
   </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .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}
+  .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}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
+  </style>
 </head>
 <!--
   The following styles are deprecated and will be removed at some point:
@@ -100,7 +106,7 @@ the pull request associated with the branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'></li>
+    <li class='tl'>iFixit</li>
     <li class='tc'>September 2013</li>
     <li class='tr'>hotfix-merge(1)</li>
   </ol>

data/man/hotfix-merge.1.markdown

@@ -0,0 +1,59 @@
+hotfix-merge(1) - Merge a hotfix branch into stable and the development branch.
+===============================================================================
+
+## SYNOPSIS
+
+`hotfix merge` [name-of-hotfix]
+`hotfix merge` -n <var>number-of-pull</var>
+
+## DESCRIPTION
+
+Merge a hotfix branch into stable and _feature.development_branch_.  If
+`name-of-hotfix` is not specified, the current branch will be used.  `hotfix
+merge` will attempt to prefill the merge message with a link to and the text of
+the pull request associated with the branch.
+
+Deletes the local copy of the branch on success.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+hotfix(1), feature-merge(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+
+
+
+[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
+[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
+[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
+[SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
+
+
+[feature(1)]: feature.1.html
+[feature-list(1)]: feature-list.1.html
+[feature-start(1)]: feature-start.1.html
+[feature-switch(1)]: feature-switch.1.html
+[feature-finish(1)]: feature-finish.1.html
+[feature-merge(1)]: feature-merge.1.html
+[feature-pull(1)]: feature-pull.1.html
+[feature-status(1)]: feature-status.1.html
+[feature-stashes(1)]: feature-stashes.1.html
+[feature-clean(1)]: feature-clean.1.html
+[feature-github-test(1)]: feature-github-test.1.html
+[hotfix(1)]: hotfix.1.html
+[hotfix-list(1)]: hotfix-list.1.html
+[hotfix-start(1)]: hotfix-start.1.html
+[hotfix-switch(1)]: hotfix-switch.1.html
+[hotfix-finish(1)]: hotfix-finish.1.html
+[hotfix-merge(1)]: hotfix-merge.1.html
+[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
+[feature-finish-issue(1)]: feature-finish-issue.1.html
+[feature-prune(1)]: feature-prune.1.html
+[hotfix-finish-issue(1)]: hotfix-finish-issue.1.html

data/man/hotfix-merge.1.ronn

@@ -4,6 +4,7 @@ hotfix-merge(1) - Merge a hotfix branch into stable and the development branch.
 ## SYNOPSIS
 
 `hotfix merge` [name-of-hotfix]
+`hotfix merge` -n <number-of-pull>
 
 ## DESCRIPTION
 

data/man/hotfix-start.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-START" "1" "April 2013" "iFixit" ""
+.TH "HOTFIX\-START" "1" "September 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-start\fR \- Start a new hotfix branch\.

data/man/{hotfix-url.1.html → hotfix-start.1.html}

@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv='content-type' value='text/html;charset=utf8'>
   <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
-  <title>hotfix-url(1) - Grab the pull request url.</title>
+  <title>hotfix-start(1) - Start a new hotfix branch.</title>
   <style type='text/css' media='all'>
   /* style: man */
   body#manpage {margin:0}
@@ -41,6 +41,12 @@
   ol.man-decor li.tc {text-align:center;letter-spacing:4px}
   ol.man-decor li.tr {text-align:right;float:right}
   </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .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}
+  .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}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
+  </style>
 </head>
 <!--
   The following styles are deprecated and will be removed at some point:
@@ -62,23 +68,23 @@
   </div>
 
   <ol class='man-decor man-head man head'>
-    <li class='tl'>hotfix-url(1)</li>
+    <li class='tl'>hotfix-start(1)</li>
     <li class='tc'></li>
-    <li class='tr'>hotfix-url(1)</li>
+    <li class='tr'>hotfix-start(1)</li>
   </ol>
 
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>hotfix-url</code> - <span class="man-whatis">Grab the pull request url.</span>
+  <code>hotfix-start</code> - <span class="man-whatis">Start a new hotfix branch.</span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>hotfix url</code> [name-of-hotfix]</p>
+<p><code>hotfix start</code> <var>name-of-hotfix</var></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>Grab the url of the pull request for the current branch or the one specified.</p>
+<p>Start a new hotfix branch based off stable.</p>
 
 <h2 id="COPYRIGHT">COPYRIGHT</h2>
 
@@ -86,7 +92,7 @@
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p><a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="feature-url.1.html">feature-url<span class="s">(1)</span></a></p>
+<p><a class="man-ref" href="hotfix.1.html">hotfix<span class="s">(1)</span></a>, <a class="man-ref" href="feature-start.1.html">feature-start<span class="s">(1)</span></a></p>
 
 <h2 id="WWW">WWW</h2>
 
@@ -95,8 +101,8 @@
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>August 2013</li>
-    <li class='tr'>hotfix-url(1)</li>
+    <li class='tc'>September 2013</li>
+    <li class='tr'>hotfix-start(1)</li>
   </ol>
 
   </div>

data/man/hotfix-start.1.markdown

@@ -0,0 +1,53 @@
+hotfix-start(1) - Start a new hotfix branch.
+============================================
+
+## SYNOPSIS
+
+`hotfix start` <var>name-of-hotfix</var>
+
+## DESCRIPTION
+
+Start a new hotfix branch based off stable.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+hotfix(1), feature-start(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+
+
+
+[SYNOPSIS]: #SYNOPSIS "SYNOPSIS"
+[DESCRIPTION]: #DESCRIPTION "DESCRIPTION"
+[COPYRIGHT]: #COPYRIGHT "COPYRIGHT"
+[SEE ALSO]: #SEE-ALSO "SEE ALSO"
+[WWW]: #WWW "WWW"
+
+
+[feature(1)]: feature.1.html
+[feature-list(1)]: feature-list.1.html
+[feature-start(1)]: feature-start.1.html
+[feature-switch(1)]: feature-switch.1.html
+[feature-finish(1)]: feature-finish.1.html
+[feature-merge(1)]: feature-merge.1.html
+[feature-pull(1)]: feature-pull.1.html
+[feature-status(1)]: feature-status.1.html
+[feature-stashes(1)]: feature-stashes.1.html
+[feature-clean(1)]: feature-clean.1.html
+[feature-github-test(1)]: feature-github-test.1.html
+[hotfix(1)]: hotfix.1.html
+[hotfix-list(1)]: hotfix-list.1.html
+[hotfix-start(1)]: hotfix-start.1.html
+[hotfix-switch(1)]: hotfix-switch.1.html
+[hotfix-finish(1)]: hotfix-finish.1.html
+[hotfix-merge(1)]: hotfix-merge.1.html
+[git(1)]: https://www.kernel.org/pub/software/scm/git/docs/
+[feature-finish-issue(1)]: feature-finish-issue.1.html
+[feature-prune(1)]: feature-prune.1.html
+[hotfix-finish-issue(1)]: hotfix-finish-issue.1.html

data/man/hotfix-switch.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-SWITCH" "1" "August 2013" "iFixit" ""
+.TH "HOTFIX\-SWITCH" "1" "September 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-switch\fR \- Switch to another hotfix branch\.

data/man/hotfix-switch.1.html

@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv='content-type' value='text/html;charset=utf8'>
+  <meta name='generator' value='Ronn/v0.7.3 (http://github.com/rtomayko/ronn/tree/0.7.3)'>
+  <title>hotfix-switch(1) - Switch to another hotfix branch.</title>
+  <style type='text/css' media='all'>
+  /* style: man */
+  body#manpage {margin:0}
+  .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
+  .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
+  .mp h2 {margin:10px 0 0 0}
+  .mp > p,.mp > pre,.mp > ul,.mp > ol,.mp > dl {margin-left:8ex}
+  .mp h3 {margin:0 0 0 4ex}
+  .mp dt {margin:0;clear:left}
+  .mp dt.flush {float:left;width:8ex}
+  .mp dd {margin:0 0 0 9ex}
+  .mp h1,.mp h2,.mp h3,.mp h4 {clear:left}
+  .mp pre {margin-bottom:20px}
+  .mp pre+h2,.mp pre+h3 {margin-top:22px}
+  .mp h2+pre,.mp h3+pre {margin-top:5px}
+  .mp img {display:block;margin:auto}
+  .mp h1.man-title {display:none}
+  .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}
+  .mp h2 {font-size:16px;line-height:1.25}
+  .mp h1 {font-size:20px;line-height:2}
+  .mp {text-align:justify;background:#fff}
+  .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
+  .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
+  .mp u {text-decoration:underline}
+  .mp code,.mp strong,.mp b {font-weight:bold;color:#131211}
+  .mp em,.mp var {font-style:italic;color:#232221;text-decoration:none}
+  .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}
+  .mp b.man-ref {font-weight:normal;color:#434241}
+  .mp pre {padding:0 4ex}
+  .mp pre code {font-weight:normal;color:#434241}
+  .mp h2+pre,h3+pre {padding-left:0}
+  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}
+  ol.man-decor {width:100%}
+  ol.man-decor li.tl {text-align:left}
+  ol.man-decor li.tc {text-align:center;letter-spacing:4px}
+  ol.man-decor li.tr {text-align:right;float:right}
+  </style>
+  <style type='text/css' media='all'>
+  /* style: toc */
+  .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}
+  .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}
+  .man-navigation a:hover {color:#111;text-decoration:underline}
+  </style>
+</head>
+<!--
+  The following styles are deprecated and will be removed at some point:
+  div#man, div#man ol.man, div#man ol.head, div#man ol.man.
+
+  The .man-page, .man-decor, .man-head, .man-foot, .man-title, and
+  .man-navigation should be used instead.
+-->
+<body id='manpage'>
+  <div class='mp' id='man'>
+
+  <div class='man-navigation' style='display:none'>
+    <a href="#NAME">NAME</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
+    <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#COPYRIGHT">COPYRIGHT</a>
+    <a href="#SEE-ALSO">SEE ALSO</a>
+    <a href="#WWW">WWW</a>
+  </div>
+
+  <ol class='man-decor man-head man head'>
+    <li class='tl'>hotfix-switch(1)</li>
+    <li class='tc'></li>
+    <li class='tr'>hotfix-switch(1)</li>
+  </ol>
+
+  <h2 id="NAME">NAME</h2>
+<p class="man-name">
+  <code>hotfix-switch</code> - <span class="man-whatis">Switch to another hotfix branch.</span>
+</p>
+
+<h2 id="SYNOPSIS">SYNOPSIS</h2>
+
+<p><code>hotfix switch</code> <var>name-of-hotfix</var>
+<code>hotfix switch</code> -n <var>number-of-pull</var></p>
+
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Switch to the <var>name-of-hotfix</var> branch, or with the -n argument switch
+to the branch with a pull request numbered <var>number-of-pull</var></p>
+
+<h2 id="COPYRIGHT">COPYRIGHT</h2>
+
+<p>Copyright (c) 2012-2013 iFixit.</p>
+
+<h2 id="SEE-ALSO">SEE ALSO</h2>
+
+<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>
+
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/iFixit/git-scripts</p>
+
+
+  <ol class='man-decor man-foot man foot'>
+    <li class='tl'>iFixit</li>
+    <li class='tc'>September 2013</li>
+    <li class='tr'>hotfix-switch(1)</li>
+  </ol>
+
+  </div>
+</body>
+</html>