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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/html/git-mark-merge-base.html
diff --git a/docs/html/git-nav-upstream.html b/docs/html/git-mark-merge-base.html
similarity index 90%
copy from docs/html/git-nav-upstream.html
copy to docs/html/git-mark-merge-base.html
index bfe08f8707b62a02a986a6aff09a8af0fc0183b4..8959068f8f51b8d91055b2378bd495e2a6851521 100644
--- a/docs/html/git-nav-upstream.html
+++ b/docs/html/git-mark-merge-base.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.9" />
-<title>git-nav-upstream(1)</title>
+<title>git-mark-merge-base(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -741,12 +741,12 @@ asciidoc.install();
<body class="manpage">
<div id="header">
<h1>
-git-nav-upstream(1) Manual Page
+git-mark-merge-base(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
-<p>git-nav-upstream -
- Checkout the upstream branch of the currently checked out branch.
+<p>git-mark-merge-base -
+ Manually interact with depot_tools' merge-base markers.
</p>
</div>
</div>
@@ -755,7 +755,9 @@ git-nav-upstream(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git nav-upstream</em></pre>
+<pre class="content"><em>git mark-merge-base</em>
+<em>git mark-merge-base</em> &lt;commit hash&gt;
+<em>git mark-merge-base</em> [-d | --delete]</pre>
<div class="attribution">
</div></div>
</div>
@@ -763,39 +765,46 @@ git-nav-upstream(1) Manual Page
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p><em>git-nav-upstream</em> takes the current branch, finds it's upstream branch, and
-checks that out.</p></div>
+<div class="paragraph"><p>Inspect, set or delete the current merge-base marker for the current branch.
+This should not be needed, but is useful if things get into a snarled state.
+Pass no arguments to view the current value. If you provide &lt;commit hash&gt;, then
+<code>git mark-merge-base</code> will attempt to set that as the merge-base value.</p></div>
+<div class="paragraph"><p>It is invalid to pick a commit which is not an ancestor of the current branch.</p></div>
+<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>
+configuration variable for more info on what the merge base markers are for.</p></div>
</div>
</div>
<div class="sect1">
-<h2 id="_example">EXAMPLE</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="listingblock">
-<div class="content">
-<pre><code><strong><span class="white">$ git map-branches</span></strong>
-<span class="red">origin/master</span>
- <span class="green">cool_feature</span>
- <strong><span class="aqua">subfeature *&#8203;</span></strong>
- <span class="green">frozen_changes</span>
- <span class="green">master</span>
-<span class="fuchsia">{NO UPSTREAM}</span>
- <span class="green">bogus_noparent</span>
-<strong><span class="white">$ git nav-upstream</span></strong>
-<strong><span class="white">$ git map-branches</span></strong>
-<span class="red">origin/master</span>
- <strong><span class="aqua">cool_feature *&#8203;</span></strong>
- <span class="green">subfeature</span>
- <span class="green">frozen_changes</span>
- <span class="green">master</span>
-<span class="fuchsia">{NO UPSTREAM}</span>
- <span class="green">bogus_noparent</span></code></pre>
-</div></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
+-d
+</dt>
+<dt class="hdlist1">
+--delete
+</dt>
+<dd>
+<p>
+ Delete the merge-base marker for the current branch.
+</p>
+</dd>
+<dt class="hdlist1">
+&lt;commit hash&gt;
+</dt>
+<dd>
+<p>
+ The new value to set for the current branch&#8217;s merge-base marker.
+</p>
+</dd>
+</dl></div>
</div>
</div>
<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<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>
+<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>,
+<a href="git-rename-branch.html">git-rename-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>
</div>
</div>
<div class="sect1">
@@ -810,7 +819,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-03-14 14:26:05 PDT
+Last updated 2014-03-25 15:09:11 PDT
</div>
</div>
</body>
« 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