RubyGems - git-scripts - Versions diffs - 0.2.0 → 0.3.0 - Mend

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.

Files changed (59) hide show

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/hotfix-switch.1.ronn CHANGED Viewed

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

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

@@ -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-start(1) - Start a new hotfix branch.</title>
+  <title>hotfix-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'>hotfix-start(1)</li>
+    <li class='tl'>hotfix-url(1)</li>
     <li class='tc'></li>
-    <li class='tr'>hotfix-start(1)</li>
+    <li class='tr'>hotfix-url(1)</li>
   </ol>
   <h2 id="NAME">NAME</h2>
 <p class="man-name">
-  <code>hotfix-start</code> - <span class="man-whatis">Start a new hotfix branch.</span>
+  <code>hotfix-url</code> - <span class="man-whatis">Grab the pull request url.</span>
 </p>
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
-<p><code>hotfix start</code> <var>name-of-hotfix</var></p>
+<p><code>hotfix url</code> [name-of-hotfix]</p>
 <h2 id="DESCRIPTION">DESCRIPTION</h2>
-<p>Start a new hotfix branch based off stable.</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="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>
+<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>
 <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'>hotfix-start(1)</li>
+    <li class='tc'>August 2013</li>
+    <li class='tr'>hotfix-url(1)</li>
   </ol>
   </div>

data/man/hotfix.1.html CHANGED Viewed

@@ -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:
@@ -92,6 +86,7 @@
 <dl>
 <dt> <a class="man-ref" href="hotfix-list.1.html">hotfix-list<span class="s">(1)</span></a></dt><dd>  List the current branch and any available hotfix branches.</dd>
+<dt> <a class="man-ref" href="hotfix-url.1.html">hotfix-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="hotfix-start.1.html">hotfix-start<span class="s">(1)</span></a></dt><dd>  Start a new hotfix branch.</dd>
 <dt> <a class="man-ref" href="hotfix-switch.1.html">hotfix-switch<span class="s">(1)</span></a></dt><dd>  Switch to another hotfix branch.</dd>
 <dt> <a class="man-ref" href="hotfix-finish.1.html">hotfix-finish<span class="s">(1)</span></a></dt><dd>  Finish this hotfix branch (push and open a pull request).</dd>
@@ -114,7 +109,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'>hotfix(1)</li>
   </ol>

metadata CHANGED Viewed

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: git-scripts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease:
 platform: ruby
 authors:
 - Daniel Beardsley
 - James Pearson
 - Tim Asp
+- Robin Choudhury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +67,7 @@ email:
 - daniel@ifixit.com
 - james@ifixit.com
 - tim@ifixit.com
+- robin@ifixit.com
 executables:
 - feature
 - hotfix
@@ -77,52 +79,40 @@ files:
 - COPYING
 - Rakefile
 - README.md
-- bash_completion.sh
+- completion/_feature
+- completion/bash_completion.sh
+- completion/_hotfix
 - bin/hotfix
 - bin/feature
 - lib/git.rb
 - lib/signal_handlers.rb
 - lib/helpers.rb
 - lib/github.rb
-- man/hotfix-switch.1.html
-- man/hotfix-start.1.html
-- man/feature-status.1.html
-- man/feature-stashes.1.html
 - man/hotfix-merge.1.ronn
 - man/feature-github-test.1
 - man/hotfix-switch.1.ronn
+- man/hotfix-finish-issue.1
 - man/feature.1.html
 - man/feature-stashes.1.ronn
-- man/feature-clean.1.html
 - man/hotfix.1
+- man/feature-finish-issue.1
 - man/hotfix-switch.1
 - man/feature-stashes.1
-- man/feature-start.1.markdown
-- man/feature-start.1.html
 - man/hotfix.1.html
-- man/feature-list.1.markdown
-- man/hotfix-finish.1.markdown
+- man/feature-url.1.html
 - man/hotfix-merge.1.html
-- man/feature-stashes.1.markdown
 - man/feature-merge.1.html
 - man/feature-switch.1.html
 - man/hotfix-start.1
 - man/index.html
 - man/feature-prune.1.ronn
 - man/feature-list.1.html
-- man/hotfix-list.1.markdown
 - man/feature-github-test.1.ronn
 - man/feature.1.ronn
-- man/feature.1.markdown
-- man/feature-switch.1.markdown
-- man/hotfix.1.markdown
-- man/hotfix-merge.1.markdown
 - man/hotfix.1.ronn
-- man/feature-github-test.1.html
+- man/hotfix-url.1.html
 - man/hotfix-finish.1.ronn
-- man/feature-merge.1.markdown
 - man/feature-start.1.ronn
-- man/hotfix-finish.1.html
 - man/hotfix-merge.1
 - man/index.txt
 - man/feature-merge.1.ronn
@@ -131,28 +121,23 @@ files:
 - man/feature.1
 - man/hotfix-list.1.ronn
 - man/feature-clean.1.ronn
-- man/feature-clean.1.markdown
 - man/feature-merge.1
 - man/hotfix-finish.1
 - man/feature-prune.1
+- man/feature-finish-issue.1.ronn
 - man/feature-status.1.ronn
 - man/feature-start.1
 - man/hotfix-list.1.html
 - man/feature-list.1.ronn
-- man/feature.html
 - man/feature-finish.1.ronn
 - man/feature-status.1
 - man/feature-finish.1.html
-- man/hotfix-switch.1.markdown
-- man/feature-status.1.markdown
 - man/feature-clean.1
-- man/feature-github-test.1.markdown
 - man/hotfix-list.1
 - man/feature-switch.1.ronn
 - man/feature-switch.1
-- man/hotfix-start.1.markdown
+- man/hotfix-finish-issue.1.ronn
 - man/hotfix-start.1.ronn
-- man/feature-finish.1.markdown
 homepage: http://ifixit.github.com/git-scripts/
 licenses: []
 post_install_message:

data/man/feature-clean.1.html DELETED Viewed

@@ -1,120 +0,0 @@
-<!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>feature-clean(1) - Remove untracked files and submodules.</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="#OPTIONS">OPTIONS</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'>feature-clean(1)</li>
-    <li class='tc'></li>
-    <li class='tr'>feature-clean(1)</li>
-  </ol>
-  <h2 id="NAME">NAME</h2>
-<p class="man-name">
-  <code>feature-clean</code> - <span class="man-whatis">Remove untracked files and submodules.</span>
-</p>
-<h2 id="SYNOPSIS">SYNOPSIS</h2>
-<p><code>feature clean</code> [--all]</p>
-<h2 id="DESCRIPTION">DESCRIPTION</h2>
-<p>Remove untracked files and submodules.</p>
-<p>Compatible with hotfix branches.</p>
-<h2 id="OPTIONS">OPTIONS</h2>
-<dl>
-<dt> <code>--clean</code></dt><dd>  Remove all untracked .gitignored files as well.</dd>
-</dl>
-<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="feature.1.html">feature<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'>April 2013</li>
-    <li class='tr'>feature-clean(1)</li>
-  </ol>
-  </div>
-</body>
-</html>

data/man/feature-clean.1.markdown DELETED Viewed

@@ -1,58 +0,0 @@
-feature-clean(1) - Remove untracked files and submodules.
-=========================================================
-## SYNOPSIS
-`feature clean` [--all]
-## DESCRIPTION
-Remove untracked files and submodules.
-Compatible with hotfix branches.
-## OPTIONS
-   * `--clean`:
-      Remove all untracked .gitignored files as well.
-## COPYRIGHT
-Copyright (c) 2012-2013 iFixit.
-## SEE ALSO
-feature(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/

data/man/feature-finish.1.markdown DELETED Viewed

@@ -1,52 +0,0 @@
-feature-finish(1) - Finish this feature branch.
-===============================================
-## SYNOPSIS
-`feature finish` <var>name-of-feature</var>
-## 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.
-## COPYRIGHT
-Copyright (c) 2012-2013 iFixit.
-## SEE ALSO
-feature(1), hotfix-finish(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/

data/man/feature-github-test.1.markdown DELETED Viewed

@@ -1,50 +0,0 @@
-feature-github-test(1) - Test Github authentication.
-=========================================================
-## SYNOPSIS
-`feature github-test`
-## DESCRIPTION
-Test Github authentication.
-## COPYRIGHT
-Copyright (c) 2012-2013 iFixit.
-## SEE ALSO
-feature(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/

data/man/feature-list.1.markdown DELETED Viewed

@@ -1,51 +0,0 @@
-feature-list(1) - Lists the current branch and any available feature branches.
-==============================================================================
-## SYNOPSIS
-`feature list`
-## DESCRIPTION
-Lists the current branch and any available feature branches.  Shows the author,
-hash, and relative time of last commit on each branch.
-## COPYRIGHT
-Copyright (c) 2012-2013 iFixit.
-## SEE ALSO
-feature(1), hotfix-list(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/

data/man/feature-merge.1.markdown DELETED Viewed

@@ -1,55 +0,0 @@
-feature-merge(1) - Merge a feature branch into the development branch.
-======================================================================
-## SYNOPSIS
-`feature merge` [name-of-feature]
-## DESCRIPTION
-Merge a feature branch into _feature.development_branch_.  If `name-of-feature`
-is not specified, the current branch will be used.  `feature 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
-feature(1), hotfix-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/