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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-map.html

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw
Patch Set: minor fixes 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
« docs/html/git-freeze.html ('K') | « docs/html/git-freeze.html ('k') | docs/html/git-map-branches.html » ('j') | docs/src/git-new-branch.txt » ('J')
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-map(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
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 Remote branches are <span class="red">red</span>. 780 Remote branches are <span class="red">red</span>.
781 </p> 781 </p>
782 </li> 782 </li>
783 <li> 783 <li>
784 <p> 784 <p>
785 Tags are <span class="fuchsia">magenta</span>. 785 Tags are <span class="fuchsia">magenta</span>.
786 </p> 786 </p>
787 </li> 787 </li>
788 <li> 788 <li>
789 <p> 789 <p>
790 Merge Base markers are <span class="black-background white">white</span>.
791 </p>
792 </li>
793 <li>
794 <p>
790 The currently checked out commit is highlighted with a <span class="yellow blue- background">blue background</span>. 795 The currently checked out commit is highlighted with a <span class="yellow blue- background">blue background</span>.
791 </p> 796 </p>
792 </li> 797 </li>
793 </ul></div> 798 </ul></div>
794 <div class="paragraph"><p>The output is automatically piped through the <code>le ss</code> pager command, even on 799 <div class="paragraph"><p>The output is automatically piped through the <code>le ss</code> pager command, even on
795 windows.</p></div> 800 windows.</p></div>
796 </div> 801 </div>
797 </div> 802 </div>
798 <div class="sect1"> 803 <div class="sect1">
799 <h2 id="_options">OPTIONS</h2> 804 <h2 id="_options">OPTIONS</h2>
800 <div class="sectionbody"> 805 <div class="sectionbody">
801 <div class="dlist"><dl> 806 <div class="dlist"><dl>
802 <dt class="hdlist1"> 807 <dt class="hdlist1">
803 &lt;extra_args&gt;&#8230; 808 &lt;extra_args&gt;&#8230;
804 </dt> 809 </dt>
805 <dd> 810 <dd>
806 <p> 811 <p>
807 Extra parameters to pass to the internal <a href="git-log.html">git-log( 1)</a> invocation. This 812 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. 813 can be used to restrict what refs <em>git map</em> operates on, etc.
809 </p> 814 </p>
810 <div class="paragraph"><p>If you run git map with a series of fixed arguments fr equently, you can use 815 <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 816 the depot-tools.map-extra configuration variable to pre-set arguments (See
812 <code>CONFIGURATION VARIABLES</code>)</p></div> 817 <code>CONFIGURATION VARIABLES</code>)</p></div>
813 </dd> 818 </dd>
814 </dl></div> 819 </dl></div>
815 </div> 820 </div>
816 </div> 821 </div>
817 <div class="sect1"> 822 <div class="sect1">
818 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2> 823 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
819 <div class="sectionbody"> 824 <div class="sectionbody">
820 <div class="sect2"> 825 <div class="sect2">
821 <h3 id="_depot_tools_map_extra">depot_tools.map_extra</h3> 826 <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 827 <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 828 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> 829 configure this, use git <code>config --add depot-tools.map-extra &lt;value&gt;</ code> to do so.</p></div>
825 </div> 830 </div>
826 </div> 831 </div>
827 </div> 832 </div>
828 <div class="sect1"> 833 <div class="sect1">
829 <h2 id="_example">EXAMPLE</h2> 834 <h2 id="_example">EXAMPLE</h2>
830 <div class="sectionbody"> 835 <div class="sectionbody">
831 <div class="paragraph"><p>Running <em>git map</em> would result in an output som ething like:</p></div> 836 <div class="paragraph"><p>Running <em>git map</em> would result in an output som ething like:</p></div>
832 <div class="listingblock"> 837 <div class="listingblock">
833 <div class="content"> 838 <div class="content">
834 <pre><code><strong><span class="white">$ git map</span></strong> 839 <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 840 <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 841 * <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 842 * <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 843 * <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 <strong><sp an class="white">&lt;(frozen_changes)</span></strong>
839 * <strong><span class="red">d15a38a</span></strong> <span class="yellow"> 2014-03-11</span> ~ Epic README update 844 * <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 845 * <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 846 <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 847 <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 848 <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> 849 <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 850 <span class="red">|</span> * <strong><span class="red">265803a</span></strong> <span class="yellow">2014-03-11</span> ~ another improvement <strong><spa n class="white">&lt;(subfeature)</span></strong>
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 851 <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 852 <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> 853 <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> 854 * <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 <strong><span class="white">&lt;(cool_feature)</span></strong></code ></pre>
850 </div></div> 855 </div></div>
851 <div class="paragraph"><p>As you can see, the structure of the commit history is visible, particularly 856 <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> 857 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 858 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> 859 branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command .</p></div>
855 </div> 860 </div>
856 </div> 861 </div>
857 <div class="sect1"> 862 <div class="sect1">
858 <h2 id="_see_also">SEE ALSO</h2> 863 <h2 id="_see_also">SEE ALSO</h2>
859 <div class="sectionbody"> 864 <div class="sectionbody">
860 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a ></p></div> 865 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a ></p></div>
861 </div> 866 </div>
862 </div> 867 </div>
863 <div class="sect1"> 868 <div class="sect1">
864 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 869 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
865 <div class="sectionbody"> 870 <div class="sectionbody">
866 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 871 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to
867 assist with the development of chromium and related projects. Download the tools 872 assist with the development of chromium and related projects. Download the tools
868 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 873 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
869 </div> 874 </div>
870 </div> 875 </div>
871 </div> 876 </div>
872 <div id="footnotes"><hr /></div> 877 <div id="footnotes"><hr /></div>
873 <div id="footer"> 878 <div id="footer">
874 <div id="footer-text"> 879 <div id="footer-text">
875 Last updated 2014-03-14 14:01:55 PDT 880 Last updated 2014-03-22 18:06:02 PDT
876 </div> 881 </div>
877 </div> 882 </div>
878 </body> 883 </body>
879 </html> 884 </html>
OLDNEW
« docs/html/git-freeze.html ('K') | « docs/html/git-freeze.html ('k') | docs/html/git-map-branches.html » ('j') | docs/src/git-new-branch.txt » ('J')

Powered by Google App Engine
This is Rietveld 408576698