| OLD | NEW |
| 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" | 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" |
| 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> | 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> |
| 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> | 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> |
| 4 <head> | 4 <head> |
| 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /
> | 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /
> |
| 6 <meta name="generator" content="AsciiDoc 8.6.9" /> | 6 <meta name="generator" content="AsciiDoc 8.6.9" /> |
| 7 <title>git-thaw(1)</title> | 7 <title>git-nav-downstream(1)</title> |
| 8 <style type="text/css"> | 8 <style type="text/css"> |
| 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ | 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ |
| 10 | 10 |
| 11 /* Default font. */ | 11 /* Default font. */ |
| 12 body { | 12 body { |
| 13 font-family: Georgia,serif; | 13 font-family: Georgia,serif; |
| 14 } | 14 } |
| 15 | 15 |
| 16 /* Title font. */ | 16 /* Title font. */ |
| 17 h1, h2, h3, h4, h5, h6, | 17 h1, h2, h3, h4, h5, h6, |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 528 } | 528 } |
| 529 body.manpage div.sectionbody { | 529 body.manpage div.sectionbody { |
| 530 margin-left: 3em; | 530 margin-left: 3em; |
| 531 } | 531 } |
| 532 | 532 |
| 533 @media print { | 533 @media print { |
| 534 body.manpage div#toc { display: none; } | 534 body.manpage div#toc { display: none; } |
| 535 } | 535 } |
| 536 | 536 |
| 537 | 537 |
| 538 div.listingblock > div.content { |
| 539 background: rgb(28, 28, 28); |
| 540 } |
| 541 |
| 542 div.listingblock > div > pre > code { |
| 543 color: rgb(187, 187, 187); |
| 544 } |
| 538 </style> | 545 </style> |
| 539 <script type="text/javascript"> | 546 <script type="text/javascript"> |
| 540 /*<![CDATA[*/ | 547 /*<![CDATA[*/ |
| 541 var asciidoc = { // Namespace. | 548 var asciidoc = { // Namespace. |
| 542 | 549 |
| 543 ///////////////////////////////////////////////////////////////////// | 550 ///////////////////////////////////////////////////////////////////// |
| 544 // Table Of Contents generator | 551 // Table Of Contents generator |
| 545 ///////////////////////////////////////////////////////////////////// | 552 ///////////////////////////////////////////////////////////////////// |
| 546 | 553 |
| 547 /* Author: Mihai Bazon, September 2002 | 554 /* Author: Mihai Bazon, September 2002 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 } | 734 } |
| 728 | 735 |
| 729 } | 736 } |
| 730 asciidoc.install(); | 737 asciidoc.install(); |
| 731 /*]]>*/ | 738 /*]]>*/ |
| 732 </script> | 739 </script> |
| 733 </head> | 740 </head> |
| 734 <body class="manpage"> | 741 <body class="manpage"> |
| 735 <div id="header"> | 742 <div id="header"> |
| 736 <h1> | 743 <h1> |
| 737 git-thaw(1) Manual Page | 744 git-nav-downstream(1) Manual Page |
| 738 </h1> | 745 </h1> |
| 739 <h2>NAME</h2> | 746 <h2>NAME</h2> |
| 740 <div class="sectionbody"> | 747 <div class="sectionbody"> |
| 741 <p>git-thaw - | 748 <p>git-nav-downstream - |
| 742 Un-freeze all changes on a frozen branch. | 749 Checkout a downstream branch of the currently checked out branch. |
| 743 </p> | 750 </p> |
| 744 </div> | 751 </div> |
| 745 </div> | 752 </div> |
| 746 <div id="content"> | 753 <div id="content"> |
| 747 <div class="sect1"> | 754 <div class="sect1"> |
| 748 <h2 id="_synopsis">SYNOPSIS</h2> | 755 <h2 id="_synopsis">SYNOPSIS</h2> |
| 749 <div class="sectionbody"> | 756 <div class="sectionbody"> |
| 750 <div class="verseblock"> | 757 <div class="verseblock"> |
| 751 <pre class="content"><em>git thaw</em></pre> | 758 <pre class="content"><em>git nav-downstream</em></pre> |
| 752 <div class="attribution"> | 759 <div class="attribution"> |
| 753 </div></div> | 760 </div></div> |
| 754 </div> | 761 </div> |
| 755 </div> | 762 </div> |
| 756 <div class="sect1"> | 763 <div class="sect1"> |
| 757 <h2 id="_description">DESCRIPTION</h2> | 764 <h2 id="_description">DESCRIPTION</h2> |
| 758 <div class="sectionbody"> | 765 <div class="sectionbody"> |
| 759 <div class="paragraph"><p><code>git thaw</code> takes a frozen branch (as made b
y <a href="git-freeze.html">git-freeze(1)</a>), and returns | 766 <div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch a
nd discovers all branches |
| 760 it to the status that it was in before it was frozen.</p></div> | 767 downstream of it. If there is only one branch downstream of the current branch, |
| 761 <div class="paragraph"><p>If you freeze a branch multiple times (i.e. change fil
es, freeze, change files, | 768 the command will check that out. If there's more than one downstream branch, the |
| 762 freeze), <code>git thaw</code> will thaw all of the freezes.</p></div> | 769 command will prompt you with a selection of the branches.</p></div> |
| 770 </div> |
| 771 </div> |
| 772 <div class="sect1"> |
| 773 <h2 id="_example">EXAMPLE</h2> |
| 774 <div class="sectionbody"> |
| 775 <div class="listingblock"> |
| 776 <div class="content"> |
| 777 <pre><code><strong><span class="white">$ git map-branches</span></strong> |
| 778 <strong><span class="red">origin/master *​</span></strong> |
| 779 <span class="green">cool_feature</span> |
| 780 <span class="green">subfeature</span> |
| 781 <span class="green">frozen_changes</span> |
| 782 <span class="green">master</span> |
| 783 <span class="fuchsia">{NO UPSTREAM}</span> |
| 784 <span class="green">bogus_noparent</span> |
| 785 <strong><span class="white">$ git nav-downstream</span></strong> |
| 786 |
| 787 Please select a downstream branch |
| 788 0. cool_feature |
| 789 1. frozen_changes |
| 790 2. master |
| 791 Selection (0-2)[0]: 0 |
| 792 <strong><span class="white">$ git map-branches</span></strong> |
| 793 <span class="red">origin/master</span> |
| 794 <strong><span class="aqua">cool_feature *​</span></strong> |
| 795 <span class="green">subfeature</span> |
| 796 <span class="green">frozen_changes</span> |
| 797 <span class="green">master</span> |
| 798 <span class="fuchsia">{NO UPSTREAM}</span> |
| 799 <span class="green">bogus_noparent</span></code></pre> |
| 800 </div></div> |
| 763 </div> | 801 </div> |
| 764 </div> | 802 </div> |
| 765 <div class="sect1"> | 803 <div class="sect1"> |
| 766 <h2 id="_see_also">SEE ALSO</h2> | 804 <h2 id="_see_also">SEE ALSO</h2> |
| 767 <div class="sectionbody"> | 805 <div class="sectionbody"> |
| 768 <div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div> | 806 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a
>, <a href="git-nav-upstream.html">git-nav-upstream(1)</a></p></div> |
| 769 </div> | 807 </div> |
| 770 </div> | 808 </div> |
| 771 <div class="sect1"> | 809 <div class="sect1"> |
| 772 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> | 810 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> |
| 773 <div class="sectionbody"> | 811 <div class="sectionbody"> |
| 774 <div class="paragraph"><p>Part of the chromium depot_tools suite. These tools ar
e meant to assist with the | 812 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_
tools(1)</a> suite. These tools are meant to |
| 775 development of chromium and related projects. Download the tools from | 813 assist with the development of chromium and related projects. Download the tools |
| 776 <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here<
/a>.</p></div> | 814 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
here</a>.</p></div> |
| 777 </div> | 815 </div> |
| 778 </div> | 816 </div> |
| 779 </div> | 817 </div> |
| 780 <div id="footnotes"><hr /></div> | 818 <div id="footnotes"><hr /></div> |
| 781 <div id="footer"> | 819 <div id="footer"> |
| 782 <div id="footer-text"> | 820 <div id="footer-text"> |
| 783 Last updated 2014-03-13 17:20:25 PDT | 821 Last updated 2014-03-14 14:24:49 PDT |
| 784 </div> | 822 </div> |
| 785 </div> | 823 </div> |
| 786 </body> | 824 </body> |
| 787 </html> | 825 </html> |
| OLD | NEW |