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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-reparent-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-rename-branch.html ('k') | docs/html/git-squash-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-downstream(1)</title> 7 <title>git-reparent-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-reparent-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-reparent-branch -
749 Checkout a downstream branch of the currently checked out branch. 749 Alter the parentage (upstream) for the current branch.
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 reparent-branch</em> &lt;new_parent&gt;
759 <em>git reparent-branch</em> --lkgr
760 <em>git reparent-branch</em> --root</pre>
759 <div class="attribution"> 761 <div class="attribution">
760 </div></div> 762 </div></div>
761 </div> 763 </div>
762 </div> 764 </div>
763 <div class="sect1"> 765 <div class="sect1">
764 <h2 id="_description">DESCRIPTION</h2> 766 <h2 id="_description">DESCRIPTION</h2>
765 <div class="sectionbody"> 767 <div class="sectionbody">
766 <div class="paragraph"><p><em>git-nav-downstream</em> takes the current branch a nd discovers all branches 768 <div class="paragraph"><p>Change the <em>upstream</em> of the current branch, an d then run
767 downstream of it. If there is only one branch downstream of the current branch, 769 <a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well
768 the command will check that out. If there's more than one downstream branch, the 770 as the commits in all descendant branches, onto the new parent.</p></div>
769 command will prompt you with a selection of the branches.</p></div> 771 <div class="paragraph"><p><code>&lt;new_parent&gt;</code> may be either a local branch, remote branch, OR a tag (such as
772 <code>lkgr</code>).</p></div>
773 <div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on
774 another CL, or vice versa. This could happen if you started both on the
775 assumption that they were independent, but later realized that this was not the
776 case.</p></div>
770 </div> 777 </div>
771 </div> 778 </div>
772 <div class="sect1"> 779 <div class="sect1">
773 <h2 id="_example">EXAMPLE</h2> 780 <h2 id="_options">OPTIONS</h2>
774 <div class="sectionbody"> 781 <div class="sectionbody">
782 <div class="dlist"><dl>
783 <dt class="hdlist1">
784 &lt;new_parent&gt;
785 </dt>
786 <dd>
787 <p>
788 The new parent to set as the upstream for this branch. May be a branch ref or
789 a tag.
790 </p>
791 </dd>
792 <dt class="hdlist1">
793 --lkgr
794 </dt>
795 <dd>
796 <p>
797 Reparent to track lkgr.
798 </p>
799 </dd>
800 <dt class="hdlist1">
801 --root
802 </dt>
803 <dd>
804 <p>
805 Reparent to track the <em>root</em> branch. Defaults to <em>origin/master</em> . See
806 <a href="git-new-branch.html">git-new-branch(1)</a>'s CONFIGURATION VARIABLES section..
807 </p>
808 </dd>
809 </dl></div>
810 </div>
811 </div>
812 <div class="sect1">
813 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
814 <div class="sectionbody">
815 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
816 file.</p></div>
775 <div class="listingblock"> 817 <div class="listingblock">
776 <div class="content"> 818 <div class="content">
777 <pre><code><strong><span class="white">$ git map-branches</span></strong> 819 <pre><code>[alias]
778 <strong><span class="red">origin/master *&#8203;</span></strong> 820 git rp = reparent-branch</code></pre>
779 <span class="green">cool_feature</span>
780 <span class="green">subfeature</span>
781 <span class="green">frozen_changes</span>
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
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>
793 <span class="red">origin/master</span>
794 <strong><span class="aqua">cool_feature *&#8203;</span></strong>
795 <span class="green">subfeature</span>
796 <span class="green">frozen_changes</span>
797 <span class="green">master</span>
798 <span class="fuchsia">{NO UPSTREAM}</span>
799 <span class="green">bogus_noparent</span></code></pre>
800 </div></div> 821 </div></div>
801 </div> 822 </div>
802 </div> 823 </div>
803 <div class="sect1"> 824 <div class="sect1">
804 <h2 id="_see_also">SEE ALSO</h2> 825 <h2 id="_see_also">SEE ALSO</h2>
805 <div class="sectionbody"> 826 <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> 827 <div class="paragraph"><p><a href="git-rebase-update.html">git-rebase-update(1)< /a>, <a href="git-rename-branch.html">git-rename-branch(1)</a>,
828 <a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff. html">git-upstream-diff(1)</a></p></div>
807 </div> 829 </div>
808 </div> 830 </div>
809 <div class="sect1"> 831 <div class="sect1">
810 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 832 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
811 <div class="sectionbody"> 833 <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 834 <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 835 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> 836 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
815 </div> 837 </div>
816 </div> 838 </div>
817 </div> 839 </div>
818 <div id="footnotes"><hr /></div> 840 <div id="footnotes"><hr /></div>
819 <div id="footer"> 841 <div id="footer">
820 <div id="footer-text"> 842 <div id="footer-text">
821 Last updated 2014-03-14 14:24:49 PDT 843 Last updated 2014-03-25 15:09:11 PDT
822 </div> 844 </div>
823 </div> 845 </div>
824 </body> 846 </body>
825 </html> 847 </html>
OLDNEW
« no previous file with comments | « docs/html/git-rename-branch.html ('k') | docs/html/git-squash-branch.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698