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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 225433003: Add a basic tutorial for the tools in depot_tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@git_map
Patch Set: pylint 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-mark-merge-base.html ('k') | docs/html/git-nav-upstream.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-nav-downstream(1)</title> 7 <title>git-nav-downstream(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 754 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 <div class="sectionbody"> 765 <div class="sectionbody">
766 <div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch a nd discovers all branches 766 <div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch a nd discovers all branches
767 downstream of it. If there is only one branch downstream of the current branch, 767 downstream of it. If there is only one branch downstream of the current branch,
768 the command will check that out. If there's more than one downstream branch, the 768 the command will check that out. If there's more than one downstream branch, the
769 command will prompt you with a selection of the branches.</p></div> 769 command will prompt you with a selection of the branches.</p></div>
770 </div> 770 </div>
771 </div> 771 </div>
772 <div class="sect1"> 772 <div class="sect1">
773 <h2 id="_example">EXAMPLE</h2> 773 <h2 id="_example">EXAMPLE</h2>
774 <div class="sectionbody"> 774 <div class="sectionbody">
775 <div class="listingblock"> 775 <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>
776 <div class="content"> 776 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e 16">origin/master *
777 <pre><code><strong><span class="white">$ git map-branches</span></strong> 777 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> cool_feature
778 <strong><span class="red">origin/master *&#8203;</span></strong> 778 </span><span style="color: #19c518"></span><span style="color: #19c518"> subf eature
779 <span class="green">cool_feature</span> 779 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
780 <span class="green">subfeature</span> 780 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
781 <span class="green">frozen_changes</span> 781 </span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</spa n>
782 <span class="green">master</span>
783 <span class="fuchsia">{NO UPSTREAM}</span>
784 <span class="green">bogus_noparent</span>
785 <strong><span class="white">$ git nav-downstream</span></strong>
786
787 Please select a downstream branch 782 Please select a downstream branch
788 0. cool_feature 783 0. cool_feature
789 1. frozen_changes 784 1. fixit
790 2. master 785 Selection (0-1)[0]: 0
791 Selection (0-2)[0]: 0 786 Previous HEAD position was 619ccc9... Make ReflectorImpl use mailboxes
792 <strong><span class="white">$ git map-branches</span></strong> 787 Switched to branch 'cool_feature'
793 <span class="red">origin/master</span> 788 Your branch is ahead of 'origin/master' by 4 commits.
794 <strong><span class="aqua">cool_feature *&#8203;</span></strong> 789 (use "git push" to publish your local commits)
795 <span class="green">subfeature</span> 790 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
796 <span class="green">frozen_changes</span> 791 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
797 <span class="green">master</span> 792 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> cool_feature *
798 <span class="fuchsia">{NO UPSTREAM}</span> 793 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> subfeature
799 <span class="green">bogus_noparent</span></code></pre> 794 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
800 </div></div> 795 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
796 </span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</spa n>
797 Switched to branch 'subfeature'
798 Your branch and 'cool_feature' have diverged,
799 and have 2 and 1 different commit each, respectively.
800 (use "git pull" to merge the remote branch into yours)
801 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
802 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
803 </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_f eature
804 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> subfeature *
805 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> fixit
806 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch</span>
807 </code></pre></div></div><p><div class="paragraph"></p></div>
801 </div> 808 </div>
802 </div> 809 </div>
803 <div class="sect1"> 810 <div class="sect1">
804 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 811 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
805 <div class="sectionbody"> 812 <div class="sectionbody">
806 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 813 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
807 file.</p></div> 814 file.</p></div>
808 <div class="listingblock"> 815 <div class="listingblock">
809 <div class="content"> 816 <div class="content">
810 <pre><code>[alias] 817 <pre><code>[alias]
811 git down = nav-downstream</code></pre> 818 git down = nav-downstream</code></pre>
812 </div></div> 819 </div></div>
813 </div> 820 </div>
814 </div> 821 </div>
815 <div class="sect1"> 822 <div class="sect1">
816 <h2 id="_see_also">SEE ALSO</h2> 823 <h2 id="_see_also">SEE ALSO</h2>
817 <div class="sectionbody"> 824 <div class="sectionbody">
818 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a >, <a href="git-nav-upstream.html">git-nav-upstream(1)</a></p></div> 825 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a >, <a href="git-nav-upstream.html">git-nav-upstream(1)</a></p></div>
819 </div> 826 </div>
820 </div> 827 </div>
821 <div class="sect1"> 828 <div class="sect1">
822 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 829 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
823 <div class="sectionbody"> 830 <div class="sectionbody">
824 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 831 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
825 assist with the development of chromium and related projects. Download the tools 832 assist with the development of chromium and related projects. Download the tools
826 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 833 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
827 </div> 834 </div>
828 </div> 835 </div>
829 </div> 836 </div>
830 <div id="footnotes"><hr /></div> 837 <div id="footnotes"><hr /></div>
831 <div id="footer"> 838 <div id="footer">
832 <div id="footer-text"> 839 <div id="footer-text">
833 Last updated 2014-03-25 15:09:11 PDT 840 Last updated 2014-04-10 14:56:15 PDT
834 </div> 841 </div>
835 </div> 842 </div>
836 </body> 843 </body>
837 </html> 844 </html>
OLDNEW
« no previous file with comments | « docs/html/git-mark-merge-base.html ('k') | docs/html/git-nav-upstream.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698