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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-nav-upstream.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-nav-downstream.html ('k') | docs/html/git-new-branch.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-upstream(1)</title> 7 <title>git-nav-upstream(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 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 <div class="sect1"> 763 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 764 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 765 <div class="sectionbody">
766 <div class="paragraph"><p><em>git-nav-upstream</em> takes the current branch, fi nds it's upstream branch, and 766 <div class="paragraph"><p><em>git-nav-upstream</em> takes the current branch, fi nds it's upstream branch, and
767 checks that out.</p></div> 767 checks that out.</p></div>
768 </div> 768 </div>
769 </div> 769 </div>
770 <div class="sect1"> 770 <div class="sect1">
771 <h2 id="_example">EXAMPLE</h2> 771 <h2 id="_example">EXAMPLE</h2>
772 <div class="sectionbody"> 772 <div class="sectionbody">
773 <div class="listingblock"> 773 <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>
774 <div class="content"> 774 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
775 <pre><code><strong><span class="white">$ git map-branches</span></strong> 775 </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_f eature
776 <span class="red">origin/master</span> 776 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> subfeature *
777 <span class="green">cool_feature</span> 777 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> fixit
778 <strong><span class="aqua">subfeature *&#8203;</span></strong> 778 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
779 <span class="green">frozen_changes</span> 779 </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
780 <span class="green">master</span> 780 Switched to branch 'cool_feature'
781 <span class="fuchsia">{NO UPSTREAM}</span> 781 Your branch is ahead of 'origin/master' by 4 commits.
782 <span class="green">bogus_noparent</span> 782 (use "git push" to publish your local commits)
783 <strong><span class="white">$ git nav-upstream</span></strong> 783 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
784 <strong><span class="white">$ git map-branches</span></strong> 784 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
785 <span class="red">origin/master</span> 785 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> cool_feature *
786 <strong><span class="aqua">cool_feature *&#8203;</span></strong> 786 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> subfeature
787 <span class="green">subfeature</span> 787 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
788 <span class="green">frozen_changes</span> 788 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
789 <span class="green">master</span> 789 </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
790 <span class="fuchsia">{NO UPSTREAM}</span> 790 Note: checking out 'origin/master'.
791 <span class="green">bogus_noparent</span></code></pre> 791
792 </div></div> 792 You are in 'detached HEAD' state. You can look around, make experimental</span> <b>&lt;1&gt;</b><span>
793 changes and commit them, and you can discard any commits you make in this
794 state without impacting any branches by performing another checkout.
795
796 If you want to create a new branch to retain commits you create, you may
797 do so (now or later) by using -b with the checkout command again. Example:
798
799 git checkout -b new_branch_name
800
801 HEAD is now at 619ccc9... Make ReflectorImpl use mailboxes
802 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
803 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e 16">origin/master *
804 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> cool_feature
805 </span><span style="color: #19c518"></span><span style="color: #19c518"> subf eature
806 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
807 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch</span>
808 </code></pre></div></div><p><div class="paragraph">
809 1. Note that being in a <em>detached HEAD</em> state is OK. You&#8217;ll just wa nt to create
810 a <a href="git-new-branch.html">git-new-branch(1)</a> from here.</p></div>
793 </div> 811 </div>
794 </div> 812 </div>
795 <div class="sect1"> 813 <div class="sect1">
796 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 814 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
797 <div class="sectionbody"> 815 <div class="sectionbody">
798 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 816 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
799 file.</p></div> 817 file.</p></div>
800 <div class="listingblock"> 818 <div class="listingblock">
801 <div class="content"> 819 <div class="content">
802 <pre><code>[alias] 820 <pre><code>[alias]
803 git up = nav-upstream</code></pre> 821 git up = nav-upstream</code></pre>
804 </div></div> 822 </div></div>
805 </div> 823 </div>
806 </div> 824 </div>
807 <div class="sect1"> 825 <div class="sect1">
808 <h2 id="_see_also">SEE ALSO</h2> 826 <h2 id="_see_also">SEE ALSO</h2>
809 <div class="sectionbody"> 827 <div class="sectionbody">
810 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a >, <a href="git-nav-downstream.html">git-nav-downstream(1)</a></p></div> 828 <div class="paragraph"><p><a href="git-map-branches.html">git-map-branches(1)</a >, <a href="git-nav-downstream.html">git-nav-downstream(1)</a></p></div>
811 </div> 829 </div>
812 </div> 830 </div>
813 <div class="sect1"> 831 <div class="sect1">
814 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 832 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
815 <div class="sectionbody"> 833 <div class="sectionbody">
816 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 834 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
817 assist with the development of chromium and related projects. Download the tools 835 assist with the development of chromium and related projects. Download the tools
818 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 836 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
819 </div> 837 </div>
820 </div> 838 </div>
821 </div> 839 </div>
822 <div id="footnotes"><hr /></div> 840 <div id="footnotes"><hr /></div>
823 <div id="footer"> 841 <div id="footer">
824 <div id="footer-text"> 842 <div id="footer-text">
825 Last updated 2014-03-25 15:09:11 PDT 843 Last updated 2014-04-10 14:57:27 PDT
826 </div> 844 </div>
827 </div> 845 </div>
828 </body> 846 </body>
829 </html> 847 </html>
OLDNEW
« no previous file with comments | « docs/html/git-nav-downstream.html ('k') | docs/html/git-new-branch.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698