Index: docs/man1/git-rename-branch.1 |
diff --git a/docs/man1/git-thaw.1 b/docs/man1/git-rename-branch.1 |
similarity index 71% |
copy from docs/man1/git-thaw.1 |
copy to docs/man1/git-rename-branch.1 |
index 63364837dacbb02bf09b6497502a275c924d2c94..6463951065d566984557212eaf1c295ab35a0576 100644 |
--- a/docs/man1/git-thaw.1 |
+++ b/docs/man1/git-rename-branch.1 |
@@ -1,13 +1,13 @@ |
'\" t |
-.\" Title: git-thaw |
+.\" Title: git-rename-branch |
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
-.\" Date: 03/14/2014 |
+.\" Date: 03/25/2014 |
.\" Manual: Chromium depot_tools Manual |
-.\" Source: depot_tools a57ed8f |
+.\" Source: depot_tools 207bff1 |
.\" Language: English |
.\" |
-.TH "GIT\-THAW" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual" |
+.TH "GIT\-RENAME\-BRANCH" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depot_tools Manual" |
.\" ----------------------------------------------------------------- |
.\" * Define some portability stuff |
.\" ----------------------------------------------------------------- |
@@ -28,21 +28,20 @@ |
.\" * MAIN CONTENT STARTS HERE * |
.\" ----------------------------------------------------------------- |
.SH "NAME" |
-git-thaw \- Un\-freeze all changes on a frozen branch\&. |
+git-rename-branch \- Rename a branch and correctly preserve all downstream relationships\&. |
.SH "SYNOPSIS" |
.sp |
.nf |
-\fIgit thaw\fR |
+\fIgit rename\-branch\fR <new_name> |
+\fIgit rename\-branch\fR <old_name> <new_name> |
.fi |
.sp |
.SH "DESCRIPTION" |
.sp |
-git thaw takes a frozen branch (as made by \fBgit-freeze\fR(1)), and returns it to the status that it was in before it was frozen\&. |
-.sp |
-If you freeze a branch multiple times (i\&.e\&. change files, freeze, change files, freeze), git thaw will thaw all of the freezes\&. |
+Rename the current (or specified) branch, then update all dowstream branches\*(Aq tracking information to preserve inter\-branch dependencies\&. |
.SH "SEE ALSO" |
.sp |
-\fBgit-freeze\fR(1) |
+\fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-new-branch\fR(1), \fBgit-upstream-diff\fR(1) |
.SH "CHROMIUM DEPOT_TOOLS" |
.sp |
Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assist with the development of chromium and related projects\&. Download the tools from \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |