OLD | NEW |
1 '\" t | 1 '\" t |
2 .\" Title: git-thaw | 2 .\" Title: git-rename-branch |
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] | 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] |
4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> | 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> |
5 .\" Date: 03/14/2014 | 5 .\" Date: 03/23/2014 |
6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
7 .\" Source: depot_tools a57ed8f | 7 .\" Source: depot_tools 936565b |
8 .\" Language: English | 8 .\" Language: English |
9 .\" | 9 .\" |
10 .TH "GIT\-THAW" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Man
ual" | 10 .TH "GIT\-RENAME\-BRANCH" "1" "03/23/2014" "depot_tools 936565b" "Chromium depot
_tools Manual" |
11 .\" ----------------------------------------------------------------- | 11 .\" ----------------------------------------------------------------- |
12 .\" * Define some portability stuff | 12 .\" * Define some portability stuff |
13 .\" ----------------------------------------------------------------- | 13 .\" ----------------------------------------------------------------- |
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
15 .\" http://bugs.debian.org/507673 | 15 .\" http://bugs.debian.org/507673 |
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html | 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html |
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
18 .ie \n(.g .ds Aq \(aq | 18 .ie \n(.g .ds Aq \(aq |
19 .el .ds Aq ' | 19 .el .ds Aq ' |
20 .\" ----------------------------------------------------------------- | 20 .\" ----------------------------------------------------------------- |
21 .\" * set default formatting | 21 .\" * set default formatting |
22 .\" ----------------------------------------------------------------- | 22 .\" ----------------------------------------------------------------- |
23 .\" disable hyphenation | 23 .\" disable hyphenation |
24 .nh | 24 .nh |
25 .\" disable justification (adjust text to left margin only) | 25 .\" disable justification (adjust text to left margin only) |
26 .ad l | 26 .ad l |
27 .\" ----------------------------------------------------------------- | 27 .\" ----------------------------------------------------------------- |
28 .\" * MAIN CONTENT STARTS HERE * | 28 .\" * MAIN CONTENT STARTS HERE * |
29 .\" ----------------------------------------------------------------- | 29 .\" ----------------------------------------------------------------- |
30 .SH "NAME" | 30 .SH "NAME" |
31 git-thaw \- Un\-freeze all changes on a frozen branch\&. | 31 git-rename-branch \- Rename a branch and correctly preserve all downstream relat
ionships\&. |
32 .SH "SYNOPSIS" | 32 .SH "SYNOPSIS" |
33 .sp | 33 .sp |
34 .nf | 34 .nf |
35 \fIgit thaw\fR | 35 \fIgit rename\-branch\fR <new_name> |
| 36 \fIgit rename\-branch\fR <old_name> <new_name> |
36 .fi | 37 .fi |
37 .sp | 38 .sp |
38 .SH "DESCRIPTION" | 39 .SH "DESCRIPTION" |
39 .sp | 40 .sp |
40 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\&. | 41 Rename the current (or specified) branch, then update all dowstream branches\*(A
q tracking information to preserve inter\-branch dependencies\&. |
41 .sp | |
42 If you freeze a branch multiple times (i\&.e\&. change files, freeze, change fil
es, freeze), git thaw will thaw all of the freezes\&. | |
43 .SH "SEE ALSO" | 42 .SH "SEE ALSO" |
44 .sp | 43 .sp |
45 \fBgit-freeze\fR(1) | 44 \fBgit-rebase-update\fR(1), \fBgit-reparent-branch\fR(1), \fBgit-new-branch\fR(1
), \fBgit-upstream-diff\fR(1) |
46 .SH "CHROMIUM DEPOT_TOOLS" | 45 .SH "CHROMIUM DEPOT_TOOLS" |
47 .sp | 46 .sp |
48 Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assi
st with the development of chromium and related projects\&. Download the tools f
rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. | 47 Part of the chromium \fBdepot_tools\fR(1) suite\&. These tools are meant to assi
st with the development of chromium and related projects\&. Download the tools f
rom \m[blue]\fBhere\fR\m[]\&\s-2\u[1]\d\s+2\&. |
49 .SH "NOTES" | 48 .SH "NOTES" |
50 .IP " 1." 4 | 49 .IP " 1." 4 |
51 here | 50 here |
52 .RS 4 | 51 .RS 4 |
53 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 52 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
54 .RE | 53 .RE |
OLD | NEW |