docs/html/git-rename-branch.html - Issue 184253003: Add git-reup and friends

Unified Diff: docs/html/git-rename-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 side-by-side diff with in-line comments

Download patch

Index: docs/html/git-rename-branch.html

diff --git a/docs/html/git-thaw.html b/docs/html/git-rename-branch.html

similarity index 95%

copy from docs/html/git-thaw.html

copy to docs/html/git-rename-branch.html

index a568e7db5ae6065c28eab796545a0643f9ed4224..f9151bdcbf42dc79a7ace2b4cf34b6b925eb3cf8 100644

--- a/docs/html/git-thaw.html

+++ b/docs/html/git-rename-branch.html

@@ -4,7 +4,7 @@

<head>

-<title>git-thaw(1)</title>

+<title>git-rename-branch(1)</title>

/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

@@ -741,12 +741,12 @@ asciidoc.install();

<h1>

-git-thaw(1) Manual Page

+git-rename-branch(1) Manual Page

</h1>

-<p>git-thaw -

- Un-freeze all changes on a frozen branch.

+<p>git-rename-branch -

+ Rename a branch and correctly preserve all downstream relationships.

</p>

</div>

@@ -755,7 +755,8 @@ git-thaw(1) Manual Page

<h2 id="_synopsis">SYNOPSIS</h2>

-<pre class="content"><em>git thaw</em></pre>

+<pre class="content"><em>git rename-branch</em> <new_name>

+<em>git rename-branch</em> <old_name> <new_name></pre>

</div></div>

</div>

@@ -763,16 +764,15 @@ git-thaw(1) Manual Page

<h2 id="_description">DESCRIPTION</h2>

-<div class="paragraph"><p><code>git thaw</code> takes a frozen branch (as made by <a href="git-freeze.html">git-freeze(1)</a>), and returns

-it to the status that it was in before it was frozen.</p></div>

-<div class="paragraph"><p>If you freeze a branch multiple times (i.e. change files, freeze, change files,

-freeze), <code>git thaw</code> will thaw all of the freezes.</p></div>

+<div class="paragraph"><p>Rename the current (or specified) branch, then update all dowstream branches'

+tracking information to preserve inter-branch dependencies.</p></div>

</div>

-<div class="paragraph"><p><a href="git-freeze.html">git-freeze(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-new-branch.html">git-new-branch(1)</a>, <a href="git-upstream-diff.html">git-upstream-diff(1)</a></p></div>

</div>

@@ -787,7 +787,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">

-Last updated 2014-03-14 13:12:40 PDT

+Last updated 2014-03-23 02:13:18 PDT

</div>

</body>

« docs/html/git-freeze.html ('K') | « docs/html/git-rebase-update.html ('k') | docs/html/git-reparent-branch.html » ('j') | docs/src/git-new-branch.txt » ('J')