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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-new-branch.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-upstream.html ('k') | docs/html/git-rebase-update.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-new-branch(1)</title> 7 <title>git-new-branch(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 812 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 <div class="sect2"> 823 <div class="sect2">
824 <h3 id="_depot_tools_upstream">depot-tools.upstream</h3> 824 <h3 id="_depot_tools_upstream">depot-tools.upstream</h3>
825 <div class="paragraph"><p>This configures the default <em>upstream</em> for all new branches. If it is unset, it 825 <div class="paragraph"><p>This configures the default <em>upstream</em> for all new branches. If it is unset, it
826 defaults to <em>origin/master</em>. This is considered to be the <em>root</em> branch.</p></div> 826 defaults to <em>origin/master</em>. This is considered to be the <em>root</em> branch.</p></div>
827 </div> 827 </div>
828 </div> 828 </div>
829 </div> 829 </div>
830 <div class="sect1"> 830 <div class="sect1">
831 <h2 id="_example">EXAMPLE</h2> 831 <h2 id="_example">EXAMPLE</h2>
832 <div class="sectionbody"> 832 <div class="sectionbody">
833 <div class="listingblock"> 833 <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>
834 <div class="content"> 834 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
835 <pre><code><strong><span class="white">$ git map-branches</span></strong> 835 </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_f eature
836 <span class="red">origin/master</span> 836 </span><span style="color: #19c518"></span><span style="color: #19c518"> subf eature
837 <span class="green">cool_feature</span> 837 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
838 <span class="green">subfeature</span> 838 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> frozen_branch *
839 <span class="aqua">frozen_changes *</span> 839 </span><span style="font-weight: bold; color: #ffffff">$ git new-branch independ ent_cl</span>
840 <strong><span class="white">$ git new-branch independent_cl</span></strong> 840 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
841 <strong><span class="white">$ git map-branches</span></strong> 841 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e 16">origin/master
842 <span class="red">origin/master</span> 842 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> cool_feature
843 <span class="green">cool_feature</span> 843 </span><span style="color: #19c518"></span><span style="color: #19c518"> subf eature
844 <span class="green">subfeature</span> 844 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
845 <span class="green">frozen_changes</span> 845 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
846 <span class="aqua">independent_cl *</span> 846 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> independent_cl *
847 <strong><span class="white">$ git new-branch --upstream subfeature nested_cl</sp an></strong> 847 </span><span style="font-weight: bold; color: #ffffff">$ git new-branch --upstre am subfeature nested_cl</span>
848 <strong><span class="white">$ git map-branches</span></strong> 848 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
849 <span class="red">origin/master</span> 849 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
850 <span class="green">cool_feature</span> 850 </span><span style="color: #19c518"></span><span style="color: #19c518"> cool_f eature
851 <span class="aqua">subfeature</span> <b>&lt;1&gt;</b> 851 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> subfeature</span> <b>&lt;1&gt;</b><span>
852 <span class="aqua">nested_cl *</span> 852 </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font- weight: bold; color: #33d6e5"> nested_cl *
853 <span class="green">frozen_changes</span> 853 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> fixit
854 <span class="green">independent_cl</span> 854 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
855 <strong><span class="white">$ git checkout cool_feature</span></strong> 855 </span><span style="color: #19c518"></span><span style="color: #19c518"> indepe ndent_cl
856 <strong><span class="white">$ git new-branch --upstream_current cl_depends_on_co ol_feature</span></strong> 856 </span><span style="font-weight: bold; color: #ffffff">$ git checkout cool_featu re</span>
857 <strong><span class="white">$ git map-branches</span></strong> 857 Your branch is ahead of 'origin/master' by 4 commits.
858 <span class="red">origin/master</span> 858 (use "git push" to publish your local commits)
859 <span class="aqua">cool_feature</span> 859 <span style="font-weight: bold; color: #ffffff">$ git new-branch --upstream_curr ent cl_depends_on_cool_feature</span>
860 <span class="aqua">cl_depends_on_cool_feature *</span> 860 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
861 <span class="green">subfeature</span> 861 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
862 <span class="green">nested_cl</span> 862 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> cool_feature
863 <span class="green">frozen_changes</span> 863 </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font- weight: bold; color: #33d6e5"> cl_depends_on_cool_feature *
864 <span class="green">independent_cl</span></code></pre> 864 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> subfeature
865 </div></div> 865 </span><span style="color: #19c518"></span><span style="color: #19c518"> ne sted_cl
866 <div class="colist arabic"><ol> 866 </span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
867 </span><span style="color: #19c518"></span><span style="color: #19c518"> froz en_branch
868 </span><span style="color: #19c518"></span><span style="color: #19c518"> indepe ndent_cl</span>
869 </code></pre></div></div><p><div class="paragraph"></p></div>
870 <div class="olist arabic"><ol class="arabic">
867 <li> 871 <li>
868 <p> 872 <p>
869 Note that both branches are cyan because they are currently the same 873 Note that both branches are cyan because they are currently the same
870 <em>commit</em> object. See <a href=":git-map-branches.html">:git-map-branches(1 )</a> for more detail. 874 <em>commit</em> object. See <a href="git-map-branches.html">git-map-branches(1)< /a> for more detail.
871 </p> 875 </p>
872 </li> 876 </li>
873 </ol></div> 877 </ol></div>
874 </div> 878 </div>
875 </div> 879 </div>
876 <div class="sect1"> 880 <div class="sect1">
877 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2> 881 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
878 <div class="sectionbody"> 882 <div class="sectionbody">
879 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em> 883 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
880 file.</p></div> 884 file.</p></div>
(...skipping 15 matching lines...) Expand all
896 <div class="sect1"> 900 <div class="sect1">
897 <h2 id="_see_also">SEE ALSO</h2> 901 <h2 id="_see_also">SEE ALSO</h2>
898 <div class="sectionbody"> 902 <div class="sectionbody">
899 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a>, <a href="git-reparent-branch.html">git-reparent-branch(1)</a>, 903 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a>, <a href="git-reparent-branch.html">git-reparent-branch(1)</a>,
900 <a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream -diff.html">git-upstream-diff(1)</a></p></div> 904 <a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream -diff.html">git-upstream-diff(1)</a></p></div>
901 </div> 905 </div>
902 </div> 906 </div>
903 <div class="sect1"> 907 <div class="sect1">
904 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 908 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
905 <div class="sectionbody"> 909 <div class="sectionbody">
906 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 910 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
907 assist with the development of chromium and related projects. Download the tools 911 assist with the development of chromium and related projects. Download the tools
908 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 912 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
909 </div> 913 </div>
910 </div> 914 </div>
911 </div> 915 </div>
912 <div id="footnotes"><hr /></div> 916 <div id="footnotes"><hr /></div>
913 <div id="footer"> 917 <div id="footer">
914 <div id="footer-text"> 918 <div id="footer-text">
915 Last updated 2014-03-25 15:09:11 PDT 919 Last updated 2014-04-10 14:23:11 PDT
916 </div> 920 </div>
917 </div> 921 </div>
918 </body> 922 </body>
919 </html> 923 </html>
OLDNEW
« no previous file with comments | « docs/html/git-nav-upstream.html ('k') | docs/html/git-rebase-update.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698