git-scripts 0.2.0 → 0.3.0

data/man/feature-finish.1

@@ -1,22 +1,22 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-FINISH" "1" "April 2013" "iFixit" ""
+.TH "FEATURE\-FINISH" "1" "July 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-finish\fR \- Finish this feature branch\.
 .
 .SH "SYNOPSIS"
-\fBfeature finish\fR \fIname\-of\-feature\fR
+\fBfeature finish\fR [name\-of\-feature]
 .
 .SH "DESCRIPTION"
-Finish the current feature 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\.
+Finish the current feature branch or the one specified\. 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\.
 .
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-feature(1), hotfix\-finish(1)
+feature(1), feature\-finish\-issue(1), hotfix\-finish(1), hotfix\-finish\-issue(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/feature-finish.1.html

@@ -41,12 +41,6 @@
   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:
@@ -80,13 +74,14 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>feature finish</code> <var>name-of-feature</var></p>
+<p><code>feature finish</code> [name-of-feature]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>Finish the current feature 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.</p>
+<p>Finish the current feature branch or the one specified. 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.</p>
 
 <h2 id="COPYRIGHT">COPYRIGHT</h2>
 
@@ -102,8 +97,8 @@ default to the commit message from the last commit on the branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tl'></li>
+    <li class='tc'>July 2013</li>
     <li class='tr'>feature-finish(1)</li>
   </ol>
 

data/man/feature-finish.1.ronn

@@ -3,13 +3,14 @@ feature-finish(1) - Finish this feature branch.
 
 ## SYNOPSIS
 
-`feature finish` <name-of-feature>
+`feature finish` [name-of-feature]
 
 ## DESCRIPTION
 
-Finish the current feature 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.
+Finish the current feature branch or the one specified. 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
 
@@ -17,7 +18,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-feature(1), hotfix-finish(1)
+feature(1), feature-finish-issue(1), hotfix-finish(1), hotfix-finish-issue(1)
 
 ## WWW
 

data/man/feature-list.1

@@ -1,17 +1,23 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-LIST" "1" "April 2013" "iFixit" ""
+.TH "FEATURE\-LIST" "1" "July 2013" "" ""
 .
 .SH "NAME"
 \fBfeature\-list\fR \- Lists the current branch and any available feature branches\.
 .
 .SH "SYNOPSIS"
-\fBfeature list\fR
+\fBfeature list\fR [\-v]
 .
 .SH "DESCRIPTION"
 Lists the current branch and any available feature branches\. Shows the author, hash, and relative time of last commit on each branch\.
 .
+.SH "OPTIONS"
+.
+.TP
+\-v
+List merged branches\.
+.
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.
 .

data/man/feature-list.1.html

@@ -41,12 +41,6 @@
   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,6 +56,7 @@
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
     <a href="#WWW">WWW</a>
@@ -80,13 +75,20 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>feature list</code></p>
+<p><code>feature list</code> [-v]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>Lists the current branch and any available feature branches.  Shows the author,
 hash, and relative time of last commit on each branch.</p>
 
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<dl>
+<dt class="flush"> -v</dt><dd>  List merged branches.</dd>
+</dl>
+
+
 <h2 id="COPYRIGHT">COPYRIGHT</h2>
 
 <p>Copyright (c) 2012-2013 iFixit.</p>
@@ -101,8 +103,8 @@ hash, and relative time of last commit on each branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tl'></li>
+    <li class='tc'>July 2013</li>
     <li class='tr'>feature-list(1)</li>
   </ol>
 

data/man/feature-list.1.ronn

@@ -3,13 +3,18 @@ feature-list(1) - Lists the current branch and any available feature branches.
 
 ## SYNOPSIS
 
-`feature list`
+`feature list` [-v]
 
 ## DESCRIPTION
 
 Lists the current branch and any available feature 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.

data/man/feature-merge.1.html

@@ -41,12 +41,6 @@
   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:
@@ -80,7 +74,8 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>feature merge</code> [name-of-feature]</p>
+<p><code>feature merge</code> [name-of-feature]
+<code>feature merge</code> -n <var>number-of-pull</var></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -105,8 +100,8 @@ request associated with the branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tl'></li>
+    <li class='tc'>September 2013</li>
     <li class='tr'>feature-merge(1)</li>
   </ol>
 

data/man/feature-switch.1

@@ -1,16 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FEATURE\-SWITCH" "1" "April 2013" "iFixit" ""
+.TH "FEATURE\-SWITCH" "1" "August 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBfeature\-switch\fR \- Switch to another feature branch\.
 .
 .SH "SYNOPSIS"
-\fBfeature switch\fR \fIname\-of\-feature\fR [\-\-clean]
+\fBfeature switch\fR \fIname\-of\-feature\fR [\-\-clean] \fBfeature switch\fR \-n \fInumber\-of\-pull\fR [\-\-clean]
 .
 .SH "DESCRIPTION"
-Switch to the \fIname\-of\-feature\fR branch\.
+Switch to the \fIname\-of\-feature\fR branch, or with the \-n argument switch to the branch with a pull request numbered \fInumber\-of\-pull\fR
 .
 .SH "OPTIONS"
 .

data/man/feature-switch.1.html

@@ -41,12 +41,6 @@
   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:
@@ -81,11 +75,13 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>feature switch</code> <var>name-of-feature</var> [--clean]</p>
+<p><code>feature switch</code> <var>name-of-feature</var> [--clean]
+<code>feature switch</code> -n <var>number-of-pull</var> [--clean]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>Switch to the <var>name-of-feature</var> branch.</p>
+<p>Switch to the <var>name-of-feature</var> branch, or with the -n argument switch
+to the branch with a pull request numbered <var>number-of-pull</var></p>
 
 <h2 id="OPTIONS">OPTIONS</h2>
 
@@ -108,8 +104,8 @@
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tl'></li>
+    <li class='tc'>August 2013</li>
     <li class='tr'>feature-switch(1)</li>
   </ol>
 

data/man/feature-switch.1.ronn

@@ -4,10 +4,12 @@ feature-switch(1) - Switch to another feature branch.
 ## SYNOPSIS
 
 `feature switch` <name-of-feature> [--clean]
+`feature switch` -n <number-of-pull> [--clean]
 
 ## DESCRIPTION
 
-Switch to the <name-of-feature> branch.
+Switch to the <name-of-feature> branch, or with the -n argument switch
+to the branch with a pull request numbered <number-of-pull>
 
 ## OPTIONS
 

data/man/{feature-github-test.1.html → feature-url.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>feature-github-test(1) - Test Github authentication.</title>
+  <title>feature-url(1) - Grab the pull request url.</title>
   <style type='text/css' media='all'>
   /* style: man */
   body#manpage {margin:0}
@@ -41,12 +41,6 @@
   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:
@@ -68,23 +62,23 @@
   </div>
 
   <ol class='man-decor man-head man head'>
-    <li class='tl'>feature-github-test(1)</li>
+    <li class='tl'>feature-url(1)</li>
     <li class='tc'></li>
-    <li class='tr'>feature-github-test(1)</li>
+    <li class='tr'>feature-url(1)</li>
   </ol>
 
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>feature-github-test</code> - <span class="man-whatis">Test Github authentication.</span>
+  <code>feature-url</code> - <span class="man-whatis">Grab the pull request url.</span>
 </p>
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>feature github-test</code></p>
+<p><code>feature url</code> [name-of-feature]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
-<p>Test Github authentication.</p>
+<p>Grab the url of the pull request for the current branch or the one specified.</p>
 
 <h2 id="COPYRIGHT">COPYRIGHT</h2>
 
@@ -92,7 +86,7 @@
 
 <h2 id="SEE-ALSO">SEE ALSO</h2>
 
-<p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a></p>
+<p><a class="man-ref" href="feature.1.html">feature<span class="s">(1)</span></a>, <a class="man-ref" href="hotfix-url.1.html">hotfix-url<span class="s">(1)</span></a></p>
 
 <h2 id="WWW">WWW</h2>
 
@@ -101,8 +95,8 @@
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
-    <li class='tr'>feature-github-test(1)</li>
+    <li class='tc'>August 2013</li>
+    <li class='tr'>feature-url(1)</li>
   </ol>
 
   </div>

data/man/feature.1.html

@@ -41,12 +41,6 @@
   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:
@@ -93,10 +87,12 @@
 <dl>
 <dt> <a class="man-ref" href="feature-list.1.html">feature-list<span class="s">(1)</span></a></dt><dd>  List the current branch and any available feature branches.</dd>
 <dt> <a class="man-ref" href="feature-start.1.html">feature-start<span class="s">(1)</span></a></dt><dd>  Start a new feature branch.</dd>
+<dt> <a class="man-ref" href="feature-url.1.html">feature-url<span class="s">(1)</span></a></dt><dd>  Get the url of a branch's pull request.</dd>
 <dt> <a class="man-ref" href="feature-switch.1.html">feature-switch<span class="s">(1)</span></a></dt><dd>  Switch to another feature branch.</dd>
 <dt> <a class="man-ref" href="feature-finish.1.html">feature-finish<span class="s">(1)</span></a></dt><dd>  Finish this feature branch (push and open a pull request).</dd>
 <dt> <a class="man-ref" href="feature-merge.1.html">feature-merge<span class="s">(1)</span></a></dt><dd>  Merge a feature branch into the development branch.</dd>
 <dt> <a class="man-ref" href="feature-pull.1.html">feature-pull<span class="s">(1)</span></a></dt><dd>  Pull remote updates into this branch.</dd>
+<dt> <span class="man-ref">feature-prune<span class="s">(1)</span></span></dt><dd>  Remove old branches on local or origin.</dd>
 <dt> <a class="man-ref" href="feature-status.1.html">feature-status<span class="s">(1)</span></a></dt><dd>  Determine if the current branch is up-to-date with the remote branch.</dd>
 <dt> <a class="man-ref" href="feature-stashes.1.html">feature-stashes<span class="s">(1)</span></a></dt><dd>  Show stashes saved on the current branch.</dd>
 <dt> <a class="man-ref" href="feature-clean.1.html">feature-clean<span class="s">(1)</span></a></dt><dd>  Remove untracked files and submodules.</dd>
@@ -119,7 +115,7 @@
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tc'>August 2013</li>
     <li class='tr'>feature(1)</li>
   </ol>
 

data/man/hotfix-finish-issue.1

@@ -0,0 +1,22 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "HOTFIX\-FINISH\-ISSUE" "1" "August 2013" "iFixit" ""
+.
+.SH "NAME"
+\fBhotfix\-finish\-issue\fR \- Finish this hotfix branch and attach it to an issue\.
+.
+.SH "SYNOPSIS"
+\fBhotfix finish\fR \fIissue\-number\fR
+.
+.SH "DESCRIPTION"
+Finish the current hotfix branch and optionally convert an existing issue into a pull request\. The pull\'s description defaults to the commit message from the last commit on the branch with the issue\'s original title and description underneath\.
+.
+.SH "COPYRIGHT"
+Copyright (c) 2012\-2013 iFixit\.
+.
+.SH "SEE ALSO"
+feature(1), feature\-finish(1), feature\-finish\-issue(1), hotfix\-finish(1)
+.
+.SH "WWW"
+https://github\.com/iFixit/git\-scripts

data/man/hotfix-finish-issue.1.ronn

@@ -0,0 +1,26 @@
+hotfix-finish-issue(1) - Finish this hotfix branch and attach it to an issue.
+===============================================
+
+## SYNOPSIS
+
+`hotfix finish` <issue-number>
+
+## DESCRIPTION
+
+Finish the current hotfix branch and optionally convert an existing issue
+into a pull request.  The pull's description defaults to the commit message
+from the last commit on the branch with the issue's original title and
+description underneath.
+
+## COPYRIGHT
+
+Copyright (c) 2012-2013 iFixit.
+
+## SEE ALSO
+
+feature(1), feature-finish(1), feature-finish-issue(1), hotfix-finish(1)
+
+## WWW
+
+https://github.com/iFixit/git-scripts
+

data/man/hotfix-finish.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-FINISH" "1" "April 2013" "iFixit" ""
+.TH "HOTFIX\-FINISH" "1" "July 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-finish\fR \- Finish this hotfix branch\.
@@ -16,7 +16,7 @@ Finish the current hotfix branch\. Push all remote commits to the remote and opt
 Copyright (c) 2012\-2013 iFixit\.
 .
 .SH "SEE ALSO"
-hotfix(1), feature\-finish(1)
+hotfix(1), hotfix\-finish\-issue(1), feature\-finish(1), feature\-finish\-issue(1)
 .
 .SH "WWW"
 https://github\.com/iFixit/git\-scripts

data/man/hotfix-finish.1.ronn

@@ -17,7 +17,7 @@ Copyright (c) 2012-2013 iFixit.
 
 ## SEE ALSO
 
-hotfix(1), feature-finish(1)
+hotfix(1), hotfix-finish-issue(1), feature-finish(1), feature-finish-issue(1)
 
 ## WWW
 

data/man/hotfix-list.1

@@ -1,17 +1,23 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-LIST" "1" "April 2013" "iFixit" ""
+.TH "HOTFIX\-LIST" "1" "July 2013" "" ""
 .
 .SH "NAME"
 \fBhotfix\-list\fR \- Lists the current branch and any available hotfix branches\.
 .
 .SH "SYNOPSIS"
-\fBhotfix list\fR
+\fBhotfix list\fR [\-v]
 .
 .SH "DESCRIPTION"
 Lists the current branch and any available hotfix branches\. Shows the author, hash, and relative time of last commit on each branch\.
 .
+.SH "OPTIONS"
+.
+.TP
+\-v
+List merged branches\.
+.
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.
 .

data/man/hotfix-list.1.html

@@ -41,12 +41,6 @@
   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,6 +56,7 @@
     <a href="#NAME">NAME</a>
     <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#DESCRIPTION">DESCRIPTION</a>
+    <a href="#OPTIONS">OPTIONS</a>
     <a href="#COPYRIGHT">COPYRIGHT</a>
     <a href="#SEE-ALSO">SEE ALSO</a>
     <a href="#WWW">WWW</a>
@@ -80,13 +75,20 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>hotfix list</code></p>
+<p><code>hotfix list</code> [-v]</p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
 <p>Lists the current branch and any available hotfix branches.  Shows the author,
 hash, and relative time of last commit on each branch.</p>
 
+<h2 id="OPTIONS">OPTIONS</h2>
+
+<dl>
+<dt class="flush"> -v</dt><dd>  List merged branches.</dd>
+</dl>
+
+
 <h2 id="COPYRIGHT">COPYRIGHT</h2>
 
 <p>Copyright (c) 2012-2013 iFixit.</p>
@@ -101,8 +103,8 @@ hash, and relative time of last commit on each branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tl'></li>
+    <li class='tc'>July 2013</li>
     <li class='tr'>hotfix-list(1)</li>
   </ol>
 

data/man/hotfix-list.1.ronn

@@ -3,13 +3,18 @@ hotfix-list(1) - Lists the current branch and any available hotfix branches.
 
 ## SYNOPSIS
 
-`hotfix list`
+`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.

data/man/hotfix-merge.1.html

@@ -41,12 +41,6 @@
   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:
@@ -80,7 +74,8 @@
 
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
-<p><code>hotfix merge</code> [name-of-hotfix]</p>
+<p><code>hotfix merge</code> [name-of-hotfix]
+<code>hotfix merge</code> -n <var>number-of-pull</var></p>
 
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
 
@@ -105,8 +100,8 @@ the pull request associated with the branch.</p>
 
 
   <ol class='man-decor man-foot man foot'>
-    <li class='tl'>iFixit</li>
-    <li class='tc'>April 2013</li>
+    <li class='tl'></li>
+    <li class='tc'>September 2013</li>
     <li class='tr'>hotfix-merge(1)</li>
   </ol>
 

data/man/hotfix-switch.1

@@ -1,16 +1,16 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "HOTFIX\-SWITCH" "1" "April 2013" "iFixit" ""
+.TH "HOTFIX\-SWITCH" "1" "August 2013" "iFixit" ""
 .
 .SH "NAME"
 \fBhotfix\-switch\fR \- Switch to another hotfix branch\.
 .
 .SH "SYNOPSIS"
-\fBhotfix switch\fR \fIname\-of\-hotfix\fR
+\fBhotfix switch\fR \fIname\-of\-hotfix\fR \fBhotfix switch\fR \-n \fInumber\-of\-pull\fR
 .
 .SH "DESCRIPTION"
-Switch to the \fIname\-of\-hotfix\fR branch\.
+Switch to the \fIname\-of\-hotfix\fR branch, or with the \-n argument switch to the branch with a pull request numbered \fInumber\-of\-pull\fR
 .
 .SH "COPYRIGHT"
 Copyright (c) 2012\-2013 iFixit\.