Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-nav-upstream.html

Issue 200903002: Add documentation for git-map-branches, git-map, git-nav-downstream, (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@documentation
Patch Set: rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « docs/html/git-nav-downstream.html ('k') | docs/html/git-thaw.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-freeze(1)</title> 7 <title>git-nav-upstream(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
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
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-freeze(1) Manual Page 744 git-nav-upstream(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-freeze - 748 <p>git-nav-upstream -
742 Freeze all changes on a branch (indexed and unindexed) 749 Checkout the upstream 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 freeze</em></pre> 758 <pre class="content"><em>git nav-upstream</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 freeze</code> works a lot like <code>git sta sh</code>, in that it stores the current changes 766 <div class="paragraph"><p><em>git-nav-upstream</em> takes the current branch, fi nds it's upstream branch, and
760 in your working copy and index <em>somewhere</em>. Unlike <code>git stash</code> , <code>git freeze</code> 767 checks that out.</p></div>
761 stores those changes on your current branch. This effectively allows you to 768 </div>
762 <em>pause</em> development of a branch, work on something else, and then come ba ck to 769 </div>
763 exactly the same working state later (by running <code>git thaw</code>).</p></di v> 770 <div class="sect1">
764 <div class="paragraph"><p><code>git freeze</code> will make up to 2 commits on y our branch. A commit with the message 771 <h2 id="_example">EXAMPLE</h2>
765 <code>FREEZE.indexed</code> will contain all changes which you’ve added to your index (like 772 <div class="sectionbody">
766 with <em>git add</em>, <em>git mv</em>, <em>git rm</em>, etc.). A commit with th e message 773 <div class="listingblock">
767 <code>FREEZE.unindexed</code> will contain all changes which were not in your in dex at the 774 <div class="content">
768 time you ran git freeze (freshly modified files, new files, etc.).</p></div> 775 <pre><code><strong><span class="white">$ git map-branches</span></strong>
776 <span class="red">origin/master</span>
777 <span class="green">cool_feature</span>
778 <strong><span class="aqua">subfeature *&#8203;</span></strong>
779 <span class="green">frozen_changes</span>
780 <span class="green">master</span>
781 <span class="fuchsia">{NO UPSTREAM}</span>
782 <span class="green">bogus_noparent</span>
783 <strong><span class="white">$ git nav-upstream</span></strong>
784 <strong><span class="white">$ git map-branches</span></strong>
785 <span class="red">origin/master</span>
786 <strong><span class="aqua">cool_feature *&#8203;</span></strong>
787 <span class="green">subfeature</span>
788 <span class="green">frozen_changes</span>
789 <span class="green">master</span>
790 <span class="fuchsia">{NO UPSTREAM}</span>
791 <span class="green">bogus_noparent</span></code></pre>
792 </div></div>
769 </div> 793 </div>
770 </div> 794 </div>
771 <div class="sect1"> 795 <div class="sect1">
772 <h2 id="_see_also">SEE ALSO</h2> 796 <h2 id="_see_also">SEE ALSO</h2>
773 <div class="sectionbody"> 797 <div class="sectionbody">
774 <div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div> 798 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a >, <a href="git-nav-downstream.html">git-nav-downstream(1)</a></p></div>
775 </div> 799 </div>
776 </div> 800 </div>
777 <div class="sect1"> 801 <div class="sect1">
778 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 802 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
779 <div class="sectionbody"> 803 <div class="sectionbody">
780 <div class="paragraph"><p>Part of the chromium depot_tools suite. These tools ar e meant to assist with the 804 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to
781 development of chromium and related projects. Download the tools from 805 assist with the development of chromium and related projects. Download the tools
782 <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here< /a>.</p></div> 806 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
783 </div> 807 </div>
784 </div> 808 </div>
785 </div> 809 </div>
786 <div id="footnotes"><hr /></div> 810 <div id="footnotes"><hr /></div>
787 <div id="footer"> 811 <div id="footer">
788 <div id="footer-text"> 812 <div id="footer-text">
789 Last updated 2014-03-13 17:20:25 PDT 813 Last updated 2014-03-14 14:26:05 PDT
790 </div> 814 </div>
791 </div> 815 </div>
792 </body> 816 </body>
793 </html> 817 </html>
OLDNEW
« no previous file with comments | « docs/html/git-nav-downstream.html ('k') | docs/html/git-thaw.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698