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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-map.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, 8 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-freeze.html ('k') | docs/html/git-map-branches.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(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(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 -
742 Un-freeze all changes on a frozen branch. 749 Display history of all branches in a 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</em> [&lt;extra_args&gt;&#8230;]</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 formats the output of <code>git log --graph</c ode> from all refs 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 </li>
773 <li>
774 <p>
775 Local branches are <span class="green">green</span>.
776 </p>
777 </li>
778 <li>
779 <p>
780 Remote branches are <span class="red">red</span>.
781 </p>
782 </li>
783 <li>
784 <p>
785 Tags are <span class="fuchsia">magenta</span>.
786 </p>
787 </li>
788 <li>
789 <p>
790 The currently checked out commit is highlighted with a <span class="yellow blue- background">blue background</span>.
791 </p>
792 </li>
793 </ul></div>
794 <div class="paragraph"><p>The output is automatically piped through the <code>le ss</code> pager command, even on
795 windows.</p></div>
796 </div>
797 </div>
798 <div class="sect1">
799 <h2 id="_options">OPTIONS</h2>
800 <div class="sectionbody">
801 <div class="dlist"><dl>
802 <dt class="hdlist1">
803 &lt;extra_args&gt;&#8230;
804 </dt>
805 <dd>
806 <p>
807 Extra parameters to pass to the internal <a href="git-log.html">git-log( 1)</a> invocation. This
808 can be used to restrict what refs <em>git map</em> operates on, etc.
809 </p>
810 <div class="paragraph"><p>If you run git map with a series of fixed arguments fr equently, you can use
811 the depot_tools.map_extra configuration variable to pre-set arguments (See
812 <code>CONFIGURATION VARIABLES</code>)</p></div>
813 </dd>
814 </dl></div>
815 </div>
816 </div>
817 <div class="sect1">
818 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
819 <div class="sectionbody">
820 <div class="sect2">
821 <h3 id="_depot_tools_map_extra">depot_tools.map_extra</h3>
822 <div class="paragraph"><p>Each value of the <em>depot_tools.map_extra</em> confi g variable is applied as an
823 additional argument to <code>git log</code> during the execution of git map. If you wish to
824 configure this, use git <code>config --add depot_tools.map_extra &lt;value&gt;</ code> to do so.</p></div>
825 </div>
826 </div>
827 </div>
828 <div class="sect1">
829 <h2 id="_example">EXAMPLE</h2>
830 <div class="sectionbody">
831 <div class="paragraph"><p>Running <em>git map</em> would result in an output som ething like:</p></div>
832 <div class="listingblock">
833 <div class="content">
834 <pre><code><strong><span class="white">$ git map</span></strong>
835 <span class="white blue-background">*</span>&#8203;<strong><span class="blue-bac kground red"> 7dcfe47 </span></strong> <span class="green">(</span>&#8203; <strong><span class="aqua">frozen_changes</span></strong>&#8203;<span class="gre en">)</span> <span class="yellow">2014-03-12</span> ~ FREEZE.unindexed
836 * <strong><span class="red">4b0c180</span></strong> <span class="yellow"> 2014-03-12</span> ~ modfile
837 * <strong><span class="red">59a7cca</span></strong> <span class="yellow"> 2014-03-12</span> ~ a deleted file
838 * <strong><span class="red">6bec695</span></strong> <span class="green">( </span>&#8203;<span class="red">origin/master</span>&#8203;<span class="green">) </span> <span class="yellow">2014-03-11</span> ~ Add neat feature
839 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update
840 * <strong><span class="red">d559894</span></strong> <span class="green">( </span>&#8203;<strong><span class="lime">master</span></strong>&#8203;<span clas s="green">)</span> <span class="yellow">2014-03-11</span> ~ Important upstream c hange
841 <span class="red">|</span> * <strong><span class="red">9c311fd</span></strong> <span class="green">(</span>&#8203;<strong><span class="lime">cool_feature</ span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-1 1</span> ~ Respond to CL comments
842 <span class="red">|</span> <span class="green">|</span> * <strong><span class="r ed">2a1eeb2</span></strong> <span class="green">(</span>&#8203;<strong><span class="lime">subfeature</span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03-11</span> ~ integrate with CoolService
843 <span class="red">|</span> <span class="green">|</span> * <strong><span class="r ed">d777af6</span></strong> <span class="yellow">2014-03-11</span> ~ slick co mmenting action
844 <span class="red">|</span> <span class="green">|/</span>
845 <span class="red">|</span> * <strong><span class="red">265803a</span></strong> <span class="yellow">2014-03-11</span> ~ another improvement
846 <span class="red">|</span> * <strong><span class="red">6d831ac</span></strong> <span class="green">(</span>&#8203;<strong><span class="fuchsia">spleen_tag< /span></strong>&#8203;<span class="green">)</span> <span class="yellow">2014-03- 11</span> ~ Refactor spleen
847 <span class="red">|</span> * <strong><span class="red">82e74ab</span></strong> <span class="yellow">2014-03-11</span> ~ Add widget
848 <span class="red">|/</span>
849 * <strong><span class="red">d08c5b3</span></strong> <span class="green">( </span>&#8203;<strong><span class="lime">bogus_noparent</span></strong>&#8203;<s pan class="green">)</span> <span class="yellow">2014-03-11</span> ~ Wonderful be ginnings</code></pre>
850 </div></div>
851 <div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly
852 what the parents of each commit are. In order to see the <em>upstream</em>
853 relationships of the branches (i.e. which branch is tracking which other
854 branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command .</p></div>
763 </div> 855 </div>
764 </div> 856 </div>
765 <div class="sect1"> 857 <div class="sect1">
766 <h2 id="_see_also">SEE ALSO</h2> 858 <h2 id="_see_also">SEE ALSO</h2>
767 <div class="sectionbody"> 859 <div class="sectionbody">
768 <div class="paragraph"><p><a href="git-freeze.html">git-freeze(1)</a></p></div> 860 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a ></p></div>
769 </div> 861 </div>
770 </div> 862 </div>
771 <div class="sect1"> 863 <div class="sect1">
772 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 864 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
773 <div class="sectionbody"> 865 <div class="sectionbody">
774 <div class="paragraph"><p>Part of the chromium depot_tools suite. These tools ar e meant to assist with the 866 <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 867 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> 868 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
777 </div> 869 </div>
778 </div> 870 </div>
779 </div> 871 </div>
780 <div id="footnotes"><hr /></div> 872 <div id="footnotes"><hr /></div>
781 <div id="footer"> 873 <div id="footer">
782 <div id="footer-text"> 874 <div id="footer-text">
783 Last updated 2014-03-13 17:20:25 PDT 875 Last updated 2014-03-14 14:01:55 PDT
784 </div> 876 </div>
785 </div> 877 </div>
786 </body> 878 </body>
787 </html> 879 </html>
OLDNEW
« no previous file with comments | « docs/html/git-freeze.html ('k') | docs/html/git-map-branches.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698