OLD | NEW |
1 '\" t | 1 '\" t |
2 .\" Title: git-nav-downstream | 2 .\" Title: git-reparent-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/25/2014 |
6 .\" Manual: Chromium depot_tools Manual | 6 .\" Manual: Chromium depot_tools Manual |
7 .\" Source: depot_tools a57ed8f | 7 .\" Source: depot_tools 207bff1 |
8 .\" Language: English | 8 .\" Language: English |
9 .\" | 9 .\" |
10 .TH "GIT\-NAV\-DOWNSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depo
t_tools Manual" | 10 .TH "GIT\-REPARENT\-BRANC" "1" "03/25/2014" "depot_tools 207bff1" "Chromium depo
t_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-nav-downstream \- Checkout a downstream branch of the currently checked out
branch\&. | 31 git-reparent-branch \- Alter the parentage (upstream) for the current branch\&. |
32 .SH "SYNOPSIS" | 32 .SH "SYNOPSIS" |
33 .sp | 33 .sp |
34 .nf | 34 .nf |
35 \fIgit nav\-downstream\fR | 35 \fIgit reparent\-branch\fR <new_parent> |
| 36 \fIgit reparent\-branch\fR \-\-lkgr |
| 37 \fIgit reparent\-branch\fR \-\-root |
36 .fi | 38 .fi |
37 .sp | 39 .sp |
38 .SH "DESCRIPTION" | 40 .SH "DESCRIPTION" |
39 .sp | 41 .sp |
40 \fIgit\-nav\-downstream\fR takes the current branch and discovers all branches d
ownstream of it\&. If there is only one branch downstream of the current branch,
the command will check that out\&. If there\*(Aqs more than one downstream bran
ch, the command will prompt you with a selection of the branches\&. | 42 Change the \fIupstream\fR of the current branch, and then run \fBgit-rebase-upda
te\fR(1) to move the commits in the current branch, as well as the commits in al
l descendant branches, onto the new parent\&. |
41 .SH "EXAMPLE" | 43 .sp |
| 44 <new_parent> may be either a local branch, remote branch, OR a tag (such as lkgr
)\&. |
| 45 .sp |
| 46 This is particularly useful to reparent an independent CL to become dependent on
another CL, or vice versa\&. This could happen if you started both on the assum
ption that they were independent, but later realized that this was not the case\
&. |
| 47 .SH "OPTIONS" |
| 48 .PP |
| 49 <new_parent> |
| 50 .RS 4 |
| 51 The new parent to set as the upstream for this branch\&. May be a branch ref or
a tag\&. |
| 52 .RE |
| 53 .PP |
| 54 \-\-lkgr |
| 55 .RS 4 |
| 56 Reparent to track lkgr\&. |
| 57 .RE |
| 58 .PP |
| 59 \-\-root |
| 60 .RS 4 |
| 61 Reparent to track the |
| 62 \fIroot\fR |
| 63 branch\&. Defaults to |
| 64 \fIorigin/master\fR\&. See |
| 65 \fBgit-new-branch\fR(1)\*(Aqs CONFIGURATION VARIABLES section\&.\&. |
| 66 .RE |
| 67 .SH "SUGGESTED ALIASES" |
| 68 .sp |
| 69 Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitcon
fig\fR file\&. |
42 .sp | 70 .sp |
43 .if n \{\ | 71 .if n \{\ |
44 .RS 4 | 72 .RS 4 |
45 .\} | 73 .\} |
46 .nf | 74 .nf |
47 \fB$ git map\-branches\fR | 75 [alias] |
48 \fBorigin/master *\:\fR | 76 git rp = reparent\-branch |
49 cool_feature | |
50 subfeature | |
51 frozen_changes | |
52 master | |
53 {NO UPSTREAM} | |
54 bogus_noparent | |
55 \fB$ git nav\-downstream\fR | |
56 | |
57 Please select a downstream branch | |
58 0\&. cool_feature | |
59 1\&. frozen_changes | |
60 2\&. master | |
61 Selection (0\-2)[0]: 0 | |
62 \fB$ git map\-branches\fR | |
63 origin/master | |
64 \fBcool_feature *\:\fR | |
65 subfeature | |
66 frozen_changes | |
67 master | |
68 {NO UPSTREAM} | |
69 bogus_noparent | |
70 .fi | 77 .fi |
71 .if n \{\ | 78 .if n \{\ |
72 .RE | 79 .RE |
73 .\} | 80 .\} |
74 .sp | 81 .sp |
75 .SH "SEE ALSO" | 82 .SH "SEE ALSO" |
76 .sp | 83 .sp |
77 \fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1) | 84 \fBgit-rebase-update\fR(1), \fBgit-rename-branch\fR(1), \fBgit-new-branch\fR(1),
\fBgit-upstream-diff\fR(1) |
78 .SH "CHROMIUM DEPOT_TOOLS" | 85 .SH "CHROMIUM DEPOT_TOOLS" |
79 .sp | 86 .sp |
80 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\&. | 87 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\&. |
81 .SH "NOTES" | 88 .SH "NOTES" |
82 .IP " 1." 4 | 89 .IP " 1." 4 |
83 here | 90 here |
84 .RS 4 | 91 .RS 4 |
85 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git | 92 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git |
86 .RE | 93 .RE |
OLD | NEW |