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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: man/html/git-map-branches.html

Issue 576423002: Fix map-branches issues and add coloring for 'branch-heads', (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: fix url bug Created 6 years, 2 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 | « git_map_branches.py ('k') | man/man1/git-map-branches.1 » ('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-map-branches(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
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 Local branches are <span class="green">green</span>. 783 Local branches are <span class="green">green</span>.
784 </p> 784 </p>
785 </li> 785 </li>
786 <li> 786 <li>
787 <p> 787 <p>
788 Remote branches are <span class="red">red</span> (usually, the root of all other branches). 788 Remote branches are <span class="red">red</span> (usually, the root of all other branches).
789 </p> 789 </p>
790 </li> 790 </li>
791 <li> 791 <li>
792 <p> 792 <p>
793 <em>branch-heads</em> branches are <span class="blue">blue</span>.
794 </p>
795 </li>
796 <li>
797 <p>
793 <code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">mag enta</span>. 798 <code>{NO UPSTREAM}</code> is a special placeholder in <span class="fuchsia">mag enta</span>.
794 </p> 799 </p>
795 <div class="ulist"><ul> 800 <div class="ulist"><ul>
796 <li> 801 <li>
797 <p> 802 <p>
798 Branches which have this as their parent are usually misconfigured, and 803 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 804 should be assigned a parent by checking out the branch and running git branch
800 --set-upstream-to=&lt;correct parent branch&gt;. 805 --set-upstream-to=&lt;correct parent branch&gt;.
801 </p> 806 </p>
802 </li> 807 </li>
(...skipping 10 matching lines...) Expand all
813 </div> 818 </div>
814 </div> 819 </div>
815 </div> 820 </div>
816 <div class="sect1"> 821 <div class="sect1">
817 <h2 id="_example">EXAMPLE</h2> 822 <h2 id="_example">EXAMPLE</h2>
818 <div class="sectionbody"> 823 <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 824 <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 825 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> 826 <em>git map-branches</em> would result in an output like:</p></div>
822 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches </span> 827 <div class="paragraph"><p></p></div><div class="listingblock"><div class="conten t"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map-branches </span>
823 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master 828 <span style="color: #d338d3"></span><span style="color: #d338d3">{NO_UPSTREAM}
829 </span><span style="color: #19c518"></span><span style="color: #19c518"> no_ups tream
830 </span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/m aster
824 </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_f eature 831 </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_f eature
825 </span><span style="color: #19c518"></span><span style="color: #19c518"> subf eature 832 </span><span style="color: #19c518"></span><span style="color: #19c518"> subf eature
826 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit 833 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
827 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> frozen_branch * 834 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> frozen_branch *</span>
828 </span><span style="font-weight: bold; color: #d338d3"></span><span style="color : #d338d3">{NO UPSTREAM}
829 </span><span style="color: #19c518"></span><span style="color: #19c518"> no_ups tream</span>
830 </code></pre></div></div><p><div class="paragraph"></p></div> 835 </code></pre></div></div><p><div class="paragraph"></p></div>
831 </div> 836 </div>
832 </div> 837 </div>
833 <div class="sect1"> 838 <div class="sect1">
834 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 839 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
835 <div class="sectionbody"> 840 <div class="sectionbody">
836 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 841 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
837 file.</p></div> 842 file.</p></div>
838 <div class="listingblock"> 843 <div class="listingblock">
839 <div class="content"> 844 <div class="content">
(...skipping 13 matching lines...) Expand all
853 <div class="sectionbody"> 858 <div class="sectionbody">
854 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 859 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
855 assist with the development of chromium and related projects. Download the tools 860 assist with the development of chromium and related projects. Download the tools
856 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 861 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
857 </div> 862 </div>
858 </div> 863 </div>
859 </div> 864 </div>
860 <div id="footnotes"><hr /></div> 865 <div id="footnotes"><hr /></div>
861 <div id="footer"> 866 <div id="footer">
862 <div id="footer-text"> 867 <div id="footer-text">
863 Last updated 2014-04-10 14:23:11 PDT 868 Last updated 2014-09-23 13:01:42 EST
864 </div> 869 </div>
865 </div> 870 </div>
866 </body> 871 </body>
867 </html> 872 </html>
OLDNEW
« no previous file with comments | « git_map_branches.py ('k') | man/man1/git-map-branches.1 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698