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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-map-branches.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-map.html ('k') | docs/html/git-nav-downstream.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-thaw(1)</title> 7 <title>git-map-branches(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-thaw(1) Manual Page 744 git-map-branches(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-map-branches -
742 Un-freeze all changes on a frozen branch. 749 Helper script to display all local git branches with ‘upstream’ hierarchy in colorized terminal format.
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 map-branches</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>Git map-branches displays all local branches such that :</p></div>
760 it to the status that it was in before it was frozen.</p></div> 767 <div class="ulist"><ul>
761 <div class="paragraph"><p>If you freeze a branch multiple times (i.e. change fil es, freeze, change files, 768 <li>
762 freeze), <code>git thaw</code> will thaw all of the freezes.</p></div> 769 <p>
770 Current branch is <span class="aqua">cyan</span>.
771 </p>
772 <div class="ulist"><ul>
773 <li>
774 <p>
775 The branch which will be modified with git-commit is denoted with an asterisk
776 (<code>*</code>) after the name.
777 </p>
778 </li>
779 </ul></div>
780 </li>
781 <li>
782 <p>
783 Local branches are <span class="green">green</span>.
784 </p>
785 </li>
786 <li>
787 <p>
788 Remote branches are <span class="red">red</span> (usually, the root of all other branches).
789 </p>
790 </li>
791 <li>
792 <p>
793 <code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">mag enta</span>.
794 </p>
795 <div class="ulist"><ul>
796 <li>
797 <p>
798 Branches which have this as their parent are usually misconfigured, and
799 should be assigned a parent by checking out the branch and running git branch
800 --set-upstream-to=&lt;correct parent branch&gt;.
801 </p>
802 </li>
803 </ul></div>
804 </li>
805 </ul></div>
806 <div class="admonitionblock">
807 <table><tr>
808 <td class="icon">
809 <div class="title">Note</div>
810 </td>
811 <td class="content">If multiple branches are on the same commit, they will all b e cyan.</td>
812 </tr></table>
813 </div>
814 </div>
815 </div>
816 <div class="sect1">
817 <h2 id="_example">EXAMPLE</h2>
818 <div class="sectionbody">
819 <div class="paragraph"><p>Given the hypothetical demo repo in <a href="git-map.h tml">git-map(1)</a>'s EXAMPLE section, and
820 assuming that the <code>frozen_changes</code> branch was currently checked out, running
821 <em>git map-branches</em> would result in an output like:</p></div>
822 <div class="listingblock">
823 <div class="content">
824 <pre><code><strong><span class="white">$ git map-branches</span></strong>
825 <span class="red">origin/master</span>
826 <span class="green">cool_feature</span>
827 <span class="green">subfeature</span>
828 <span class="aqua">frozen_changes *</span>
829 <span class="green">master</span>
830 <span class="fuchsia">{NO UPSTREAM}</span>
831 <span class="green">bogus_noparent</span>
832 <span class="aqua">duplicate_cool_feature_no_upstream</span></code></pre>
833 </div></div>
763 </div> 834 </div>
764 </div> 835 </div>
765 <div class="sect1"> 836 <div class="sect1">
766 <h2 id="_see_also">SEE ALSO</h2> 837 <h2 id="_see_also">SEE ALSO</h2>
767 <div class="sectionbody"> 838 <div class="sectionbody">
768 <div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div> 839 <div class="paragraph"><p><a href="git-map.html">git-map(1)</a></p></div>
769 </div> 840 </div>
770 </div> 841 </div>
771 <div class="sect1"> 842 <div class="sect1">
772 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 843 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
773 <div class="sectionbody"> 844 <div class="sectionbody">
774 <div class="paragraph"><p>Part of the chromium depot_tools suite. These tools ar e meant to assist with the 845 <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 846 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> 847 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
777 </div> 848 </div>
778 </div> 849 </div>
779 </div> 850 </div>
780 <div id="footnotes"><hr /></div> 851 <div id="footnotes"><hr /></div>
781 <div id="footer"> 852 <div id="footer">
782 <div id="footer-text"> 853 <div id="footer-text">
783 Last updated 2014-03-13 17:20:25 PDT 854 Last updated 2014-03-14 14:01:10 PDT
784 </div> 855 </div>
785 </div> 856 </div>
786 </body> 857 </body>
787 </html> 858 </html>
OLDNEW
« no previous file with comments | « docs/html/git-map.html ('k') | docs/html/git-nav-downstream.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698