123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293 |
- '\" t
- .\" Title: git-reparent-branch
- .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
- .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
- .\" Date: 05/03/2019
- .\" Manual: Chromium depot_tools Manual
- .\" Source: depot_tools e58cce6c
- .\" Language: English
- .\"
- .TH "GIT\-REPARENT\-BRANC" "1" "05/03/2019" "depot_tools e58cce6c" "Chromium depot_tools Manual"
- .\" -----------------------------------------------------------------
- .\" * Define some portability stuff
- .\" -----------------------------------------------------------------
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .\" http://bugs.debian.org/507673
- .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .ie \n(.g .ds Aq \(aq
- .el .ds Aq '
- .\" -----------------------------------------------------------------
- .\" * set default formatting
- .\" -----------------------------------------------------------------
- .\" disable hyphenation
- .nh
- .\" disable justification (adjust text to left margin only)
- .ad l
- .\" -----------------------------------------------------------------
- .\" * MAIN CONTENT STARTS HERE *
- .\" -----------------------------------------------------------------
- .SH "NAME"
- git-reparent-branch \- Alter the parentage (upstream) for the current branch\&.
- .SH "SYNOPSIS"
- .sp
- .nf
- \fIgit reparent\-branch\fR <new_parent>
- \fIgit reparent\-branch\fR \-\-lkgr
- \fIgit reparent\-branch\fR \-\-root
- .fi
- .sp
- .SH "DESCRIPTION"
- .sp
- Change the \fIupstream\fR of the current branch, and then run \fBgit-rebase-update\fR(1) to move the commits in the current branch, as well as the commits in all descendant branches, onto the new parent\&.
- .sp
- <new_parent> may be either a local branch, remote branch, OR a tag (such as lkgr)\&.
- .sp
- 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 assumption that they were independent, but later realized that this was not the case\&.
- .SH "OPTIONS"
- .PP
- <new_parent>
- .RS 4
- The new parent to set as the upstream for this branch\&. May be a branch ref or a tag\&.
- .RE
- .PP
- \-\-lkgr
- .RS 4
- Reparent to track lkgr\&.
- .RE
- .PP
- \-\-root
- .RS 4
- Reparent to track the
- \fIroot\fR
- branch\&. Defaults to
- \fIorigin/master\fR\&. See
- \fBgit-new-branch\fR(1)\*(Aqs CONFIGURATION VARIABLES section\&.\&.
- .RE
- .SH "SUGGESTED ALIASES"
- .sp
- Some common short\-hand aliases\&. Feel free to add these to your \fI~/\&.gitconfig\fR file\&.
- .sp
- .if n \{\
- .RS 4
- .\}
- .nf
- [alias]
- git rp = reparent\-branch
- .fi
- .if n \{\
- .RE
- .\}
- .sp
- .SH "SEE ALSO"
- .sp
- \fBgit-rebase-update\fR(1), \fBgit-rename-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(7) 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\&.
- .SH "NOTES"
- .IP " 1." 4
- here
- .RS 4
- \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
- .RE
|