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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: docs/html/git-mark-merge-base.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-map-branches.html ('k') | docs/html/git-nav-downstream.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-mark-merge-base(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-mark-merge-base(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-mark-merge-base -
749 Checkout the upstream branch of the currently checked out branch. 749 Manually interact with depot_tools' merge-base markers.
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 mark-merge-base</em>
759 <em>git mark-merge-base</em> &lt;commit hash&gt;
760 <em>git mark-merge-base</em> [-d | --delete]</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-upstream</em> takes the current branch, fi nds it's upstream branch, and 768 <div class="paragraph"><p>Inspect, set or delete the current merge-base marker f or the current branch.
767 checks that out.</p></div> 769 This should not be needed, but is useful if things get into a snarled state.
770 Pass no arguments to view the current value. If you provide &lt;commit hash&gt;, then
771 <code>git mark-merge-base</code> will attempt to set that as the merge-base valu e.</p></div>
772 <div class="paragraph"><p>It is invalid to pick a commit which is not an ancesto r of the current branch.</p></div>
773 <div class="paragraph"><p>See <a href="git-rebase-update.html">git-rebase-update (1)</a>'s description of the <code>branch.&lt;name&gt;.base</code>
774 configuration variable for more info on what the merge base markers are for.</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="_options">OPTIONS</h2>
772 <div class="sectionbody"> 779 <div class="sectionbody">
773 <div class="listingblock"> 780 <div class="dlist"><dl>
774 <div class="content"> 781 <dt class="hdlist1">
775 <pre><code><strong><span class="white">$ git map-branches</span></strong> 782 -d
776 <span class="red">origin/master</span> 783 </dt>
777 <span class="green">cool_feature</span> 784 <dt class="hdlist1">
778 <strong><span class="aqua">subfeature *&#8203;</span></strong> 785 --delete
779 <span class="green">frozen_changes</span> 786 </dt>
780 <span class="green">master</span> 787 <dd>
781 <span class="fuchsia">{NO UPSTREAM}</span> 788 <p>
782 <span class="green">bogus_noparent</span> 789 Delete the merge-base marker for the current branch.
783 <strong><span class="white">$ git nav-upstream</span></strong> 790 </p>
784 <strong><span class="white">$ git map-branches</span></strong> 791 </dd>
785 <span class="red">origin/master</span> 792 <dt class="hdlist1">
786 <strong><span class="aqua">cool_feature *&#8203;</span></strong> 793 &lt;commit hash&gt;
787 <span class="green">subfeature</span> 794 </dt>
788 <span class="green">frozen_changes</span> 795 <dd>
789 <span class="green">master</span> 796 <p>
790 <span class="fuchsia">{NO UPSTREAM}</span> 797 The new value to set for the current branch&#8217;s merge-base marker.
791 <span class="green">bogus_noparent</span></code></pre> 798 </p>
792 </div></div> 799 </dd>
800 </dl></div>
793 </div> 801 </div>
794 </div> 802 </div>
795 <div class="sect1"> 803 <div class="sect1">
796 <h2 id="_see_also">SEE ALSO</h2> 804 <h2 id="_see_also">SEE ALSO</h2>
797 <div class="sectionbody"> 805 <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> 806 <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>,
807 <a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream -diff.html">git-upstream-diff(1)</a></p></div>
799 </div> 808 </div>
800 </div> 809 </div>
801 <div class="sect1"> 810 <div class="sect1">
802 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2> 811 <h2 id="_chromium_depot_tools">CHROMIUM DEPOT_TOOLS</h2>
803 <div class="sectionbody"> 812 <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 813 <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 814 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> 815 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
807 </div> 816 </div>
808 </div> 817 </div>
809 </div> 818 </div>
810 <div id="footnotes"><hr /></div> 819 <div id="footnotes"><hr /></div>
811 <div id="footer"> 820 <div id="footer">
812 <div id="footer-text"> 821 <div id="footer-text">
813 Last updated 2014-03-14 14:26:05 PDT 822 Last updated 2014-03-25 15:09:11 PDT
814 </div> 823 </div>
815 </div> 824 </div>
816 </body> 825 </body>
817 </html> 826 </html>
OLDNEW
« no previous file with comments | « docs/html/git-map-branches.html ('k') | docs/html/git-nav-downstream.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698