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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-new-branch.html

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw
Patch Set: fix pylint 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
« 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-nav-downstream(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
11 /* Default font. */ 11 /* Default font. */
12 body { 12 body {
13 font-family: Georgia,serif; 13 font-family: Georgia,serif;
14 } 14 }
15 15
16 /* Title font. */ 16 /* Title font. */
17 h1, h2, h3, h4, h5, h6, 17 h1, h2, h3, h4, h5, h6,
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 } 734 }
735 735
736 } 736 }
737 asciidoc.install(); 737 asciidoc.install();
738 /*]]>*/ 738 /*]]>*/
739 </script> 739 </script>
740 </head> 740 </head>
741 <body class="manpage"> 741 <body class="manpage">
742 <div id="header"> 742 <div id="header">
743 <h1> 743 <h1>
744 git-nav-downstream(1) Manual Page 744 git-new-branch(1) Manual Page
745 </h1> 745 </h1>
746 <h2>NAME</h2> 746 <h2>NAME</h2>
747 <div class="sectionbody"> 747 <div class="sectionbody">
748 <p>git-nav-downstream - 748 <p>git-new-branch -
749 Checkout a downstream branch of the currently checked out branch. 749 Create a new branch with correct tracking information.
750 </p> 750 </p>
751 </div> 751 </div>
752 </div> 752 </div>
753 <div id="content"> 753 <div id="content">
754 <div class="sect1"> 754 <div class="sect1">
755 <h2 id="_synopsis">SYNOPSIS</h2> 755 <h2 id="_synopsis">SYNOPSIS</h2>
756 <div class="sectionbody"> 756 <div class="sectionbody">
757 <div class="verseblock"> 757 <div class="verseblock">
758 <pre class="content"><em>git nav-downstream</em></pre> 758 <pre class="content"><em>git new-branch</em> &lt;branch_name&gt;
759 <em>git new-branch</em> --upstream_current &lt;branch_name&gt;
760 <em>git new-branch</em> --upstream &lt;REF&gt; &lt;branch_name&gt;
761 <em>git new-branch</em> --lkgr &lt;branch_name&gt;</pre>
759 <div class="attribution"> 762 <div class="attribution">
760 </div></div> 763 </div></div>
761 </div> 764 </div>
762 </div> 765 </div>
763 <div class="sect1"> 766 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 767 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 768 <div class="sectionbody">
766 <div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch a nd discovers all branches 769 <div class="paragraph"><p>Creates a new branch. By default the new branch will t rack the configured
767 downstream of it. If there is only one branch downstream of the current branch, 770 upstream for the repo (defaults to <em>origin/master</em>). If one of the other options
768 the command will check that out. If there's more than one downstream branch, the 771 is specified, it will track that other ref instead.</p></div>
769 command will prompt you with a selection of the branches.</p></div> 772 <div class="paragraph"><p>Conceptually, each branch in your repo represents one <em>Change List (CL)</em>. If you
773 have many independent CLs (i.e. the changes in one do not interact with/depend
774 on the changes in another), then you should create them as new branches tracking
775 the default upstream (i.e. <code>git new-branch &lt;branch_name&gt;</code>). If you have features
776 which depend on each other, you should create stacked branches using <code>git
777 new-branch --upstream_current &lt;branch_name&gt;</code>.</p></div>
770 </div> 778 </div>
771 </div> 779 </div>
772 <div class="sect1"> 780 <div class="sect1">
781 <h2 id="_options">OPTIONS</h2>
782 <div class="sectionbody">
783 <div class="dlist"><dl>
784 <dt class="hdlist1">
785 --upstream_current
786 </dt>
787 <dd>
788 <p>
789 Set the tracking (upstream) branch to the currently-checked-out branch.
790 </p>
791 </dd>
792 <dt class="hdlist1">
793 --uptstream &lt;REF&gt;
794 </dt>
795 <dd>
796 <p>
797 Set the tracking (upstream) branch to &lt;REF&gt;. &lt;REF&gt; may be a local branch,
798 remote branch, or a tag.
799 </p>
800 </dd>
801 <dt class="hdlist1">
802 --lkgr
803 </dt>
804 <dd>
805 <p>
806 Alias for <code>--upstream lkgr</code>.
807 </p>
808 </dd>
809 <dt class="hdlist1">
810 &lt;branch_name&gt;
811 </dt>
812 <dd>
813 <p>
814 The name for the new branch.
815 </p>
816 </dd>
817 </dl></div>
818 </div>
819 </div>
820 <div class="sect1">
821 <h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
822 <div class="sectionbody">
823 <div class="sect2">
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
826 defaults to <em>origin/master</em>. This is considered to be the <em>root</em> branch.</p></div>
827 </div>
828 </div>
829 </div>
830 <div class="sect1">
773 <h2 id="_example">EXAMPLE</h2> 831 <h2 id="_example">EXAMPLE</h2>
774 <div class="sectionbody"> 832 <div class="sectionbody">
775 <div class="listingblock"> 833 <div class="listingblock">
776 <div class="content"> 834 <div class="content">
777 <pre><code><strong><span class="white">$ git map-branches</span></strong> 835 <pre><code><strong><span class="white">$ git map-branches</span></strong>
778 <strong><span class="red">origin/master *&#8203;</span></strong> 836 <span class="red">origin/master</span>
837 <span class="green">cool_feature</span>
838 <span class="green">subfeature</span>
839 <span class="aqua">frozen_changes *</span>
840 <strong><span class="white">$ git new-branch independent_cl</span></strong>
841 <strong><span class="white">$ git map-branches</span></strong>
842 <span class="red">origin/master</span>
779 <span class="green">cool_feature</span> 843 <span class="green">cool_feature</span>
780 <span class="green">subfeature</span> 844 <span class="green">subfeature</span>
781 <span class="green">frozen_changes</span> 845 <span class="green">frozen_changes</span>
782 <span class="green">master</span> 846 <span class="aqua">independent_cl *</span>
783 <span class="fuchsia">{NO UPSTREAM}</span> 847 <strong><span class="white">$ git new-branch --upstream subfeature nested_cl</sp an></strong>
784 <span class="green">bogus_noparent</span>
785 <strong><span class="white">$ git nav-downstream</span></strong>
786
787 Please select a downstream branch
788 0. cool_feature
789 1. frozen_changes
790 2. master
791 Selection (0-2)[0]: 0
792 <strong><span class="white">$ git map-branches</span></strong> 848 <strong><span class="white">$ git map-branches</span></strong>
793 <span class="red">origin/master</span> 849 <span class="red">origin/master</span>
794 <strong><span class="aqua">cool_feature *&#8203;</span></strong> 850 <span class="green">cool_feature</span>
851 <span class="aqua">subfeature</span> <b>&lt;1&gt;</b>
852 <span class="aqua">nested_cl *</span>
853 <span class="green">frozen_changes</span>
854 <span class="green">independent_cl</span>
855 <strong><span class="white">$ git checkout cool_feature</span></strong>
856 <strong><span class="white">$ git new-branch --upstream_current cl_depends_on_co ol_feature</span></strong>
857 <strong><span class="white">$ git map-branches</span></strong>
858 <span class="red">origin/master</span>
859 <span class="aqua">cool_feature</span>
860 <span class="aqua">cl_depends_on_cool_feature *</span>
795 <span class="green">subfeature</span> 861 <span class="green">subfeature</span>
862 <span class="green">nested_cl</span>
796 <span class="green">frozen_changes</span> 863 <span class="green">frozen_changes</span>
797 <span class="green">master</span> 864 <span class="green">independent_cl</span></code></pre>
798 <span class="fuchsia">{NO UPSTREAM}</span>
799 <span class="green">bogus_noparent</span></code></pre>
800 </div></div> 865 </div></div>
866 <div class="colist arabic"><ol>
867 <li>
868 <p>
869 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.
871 </p>
872 </li>
873 </ol></div>
874 </div>
875 </div>
876 <div class="sect1">
877 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
878 <div class="sectionbody">
879 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
880 file.</p></div>
881 <div class="listingblock">
882 <div class="content">
883 <pre><code>[alias]
884 git nb = new-branch
885 git tb = new-branch --upstream_current <b>&lt;1&gt;</b></code></pre>
886 </div></div>
887 <div class="colist arabic"><ol>
888 <li>
889 <p>
890 mnemonic: tb &#8594; "track branch"
891 </p>
892 </li>
893 </ol></div>
801 </div> 894 </div>
802 </div> 895 </div>
803 <div class="sect1"> 896 <div class="sect1">
804 <h2 id="_see_also">SEE ALSO</h2> 897 <h2 id="_see_also">SEE ALSO</h2>
805 <div class="sectionbody"> 898 <div class="sectionbody">
806 <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> 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>,
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>
807 </div> 901 </div>
808 </div> 902 </div>
809 <div class="sect1"> 903 <div class="sect1">
810 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 904 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
811 <div class="sectionbody"> 905 <div class="sectionbody">
812 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 906 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to
813 assist with the development of chromium and related projects. Download the tools 907 assist with the development of chromium and related projects. Download the tools
814 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 908 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
815 </div> 909 </div>
816 </div> 910 </div>
817 </div> 911 </div>
818 <div id="footnotes"><hr /></div> 912 <div id="footnotes"><hr /></div>
819 <div id="footer"> 913 <div id="footer">
820 <div id="footer-text"> 914 <div id="footer-text">
821 Last updated 2014-03-14 14:24:49 PDT 915 Last updated 2014-03-25 15:09:11 PDT
822 </div> 916 </div>
823 </div> 917 </div>
824 </body> 918 </body>
825 </html> 919 </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