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

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: minor fixes 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
« docs/html/git-freeze.html ('K') | « docs/html/git-rename-branch.html ('k') | docs/html/git-squash-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')
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-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-upstream(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-upstream - 748 <p>git-reparent-branch -
749 Checkout the upstream 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-upstream</em></pre> 758 <pre class="content"><em>git reparent-branch</em> &lt;new_parent&gt;</pre>
759 <div class="attribution"> 759 <div class="attribution">
760 </div></div> 760 </div></div>
761 </div> 761 </div>
762 </div> 762 </div>
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>Change the <em>upstream</em> of the current branch, an d then run
767 checks that out.</p></div> 767 <a href="git-rebase-update.html">git-rebase-update(1)</a> to move the commits in the current branch, as well
768 as the commits in all descendant branches, onto the new parent.</p></div>
769 <div class="paragraph"><p><code>&lt;new_parent&gt;</code> may be either a local branch, remote branch, OR a tag (such as
770 <code>lkgr</code>).</p></div>
771 <div class="paragraph"><p>This is particularly useful to reparent an independent CL to become dependent on
772 another CL, or vice versa. This could happen if you started both on the
773 assumption that they were independent, but later realized that this was not the
774 case.</p></div>
768 </div> 775 </div>
769 </div> 776 </div>
770 <div class="sect1"> 777 <div class="sect1">
771 <h2 id="_example">EXAMPLE</h2> 778 <h2 id="_suggested_aliases">SUGGESTED ALIASES</h2>
772 <div class="sectionbody"> 779 <div class="sectionbody">
780 <div class="paragraph"><p>Some common short-hand aliases. Feel free to add these to your <em>~/.gitconfig</em>
781 file.</p></div>
773 <div class="listingblock"> 782 <div class="listingblock">
774 <div class="content"> 783 <div class="content">
775 <pre><code><strong><span class="white">$ git map-branches</span></strong> 784 <pre><code>[alias]
776 <span class="red">origin/master</span> 785 git rp = reparent-branch</code></pre>
777 <span class="green">cool_feature</span>
778 <strong><span class="aqua">subfeature *&#8203;</span></strong>
779 <span class="green">frozen_changes</span>
780 <span class="green">master</span>
781 <span class="fuchsia">{NO UPSTREAM}</span>
782 <span class="green">bogus_noparent</span>
783 <strong><span class="white">$ git nav-upstream</span></strong>
784 <strong><span class="white">$ git map-branches</span></strong>
785 <span class="red">origin/master</span>
786 <strong><span class="aqua">cool_feature *&#8203;</span></strong>
787 <span class="green">subfeature</span>
788 <span class="green">frozen_changes</span>
789 <span class="green">master</span>
790 <span class="fuchsia">{NO UPSTREAM}</span>
791 <span class="green">bogus_noparent</span></code></pre>
792 </div></div> 786 </div></div>
793 </div> 787 </div>
794 </div> 788 </div>
795 <div class="sect1"> 789 <div class="sect1">
796 <h2 id="_see_also">SEE ALSO</h2> 790 <h2 id="_see_also">SEE ALSO</h2>
797 <div class="sectionbody"> 791 <div class="sectionbody">
798 <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> 792 <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>,
793 <a href="git-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff. html">git-upstream-diff(1)</a></p></div>
799 </div> 794 </div>
800 </div> 795 </div>
801 <div class="sect1"> 796 <div class="sect1">
802 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 797 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
803 <div class="sectionbody"> 798 <div class="sectionbody">
804 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to 799 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(1)</a> suite. These tools are meant to
805 assist with the development of chromium and related projects. Download the tools 800 assist with the development of chromium and related projects. Download the tools
806 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 801 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
807 </div> 802 </div>
808 </div> 803 </div>
809 </div> 804 </div>
810 <div id="footnotes"><hr /></div> 805 <div id="footnotes"><hr /></div>
811 <div id="footer"> 806 <div id="footer">
812 <div id="footer-text"> 807 <div id="footer-text">
813 Last updated 2014-03-14 14:26:05 PDT 808 Last updated 2014-03-23 02:13:18 PDT
814 </div> 809 </div>
815 </div> 810 </div>
816 </body> 811 </body>
817 </html> 812 </html>
OLDNEW
« docs/html/git-freeze.html ('K') | « docs/html/git-rename-branch.html ('k') | docs/html/git-squash-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')

Powered by Google App Engine
This is Rietveld 408576698