Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: docs/man1/git-reparent-branch.1

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/man1/git-reparent-branch.1
diff --git a/docs/man1/git-nav-downstream.1 b/docs/man1/git-reparent-branch.1
similarity index 59%
copy from docs/man1/git-nav-downstream.1
copy to docs/man1/git-reparent-branch.1
index de000e21e22b57de50a2cf4bd237076aac7194a3..d627c340695b0c4a5d10add6995b86070aaf31f3 100644
--- a/docs/man1/git-nav-downstream.1
+++ b/docs/man1/git-reparent-branch.1
@@ -1,13 +1,13 @@
'\" t
-.\" Title: git-nav-downstream
+.\" Title: git-reparent-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/23/2014
.\" Manual: Chromium depot_tools Manual
-.\" Source: depot_tools a57ed8f
+.\" Source: depot_tools 936565b
.\" Language: English
.\"
-.TH "GIT\-NAV\-DOWNSTREAM" "1" "03/14/2014" "depot_tools a57ed8f" "Chromium depot_tools Manual"
+.TH "GIT\-REPARENT\-BRANC" "1" "03/23/2014" "depot_tools 936565b" "Chromium depot_tools Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -28,45 +28,30 @@
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
-git-nav-downstream \- Checkout a downstream branch of the currently checked out branch\&.
+git-reparent-branch \- Alter the parentage (upstream) for the current branch\&.
.SH "SYNOPSIS"
.sp
.nf
-\fIgit nav\-downstream\fR
+\fIgit reparent\-branch\fR <new_parent>
.fi
.sp
.SH "DESCRIPTION"
.sp
-\fIgit\-nav\-downstream\fR takes the current branch and discovers all branches downstream 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 branch, the command will prompt you with a selection of the branches\&.
-.SH "EXAMPLE"
+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 "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
-\fB$ git map\-branches\fR
-\fBorigin/master *\:\fR
- cool_feature
- subfeature
- frozen_changes
- master
-{NO UPSTREAM}
- bogus_noparent
-\fB$ git nav\-downstream\fR
-
-Please select a downstream branch
- 0\&. cool_feature
- 1\&. frozen_changes
- 2\&. master
-Selection (0\-2)[0]: 0
-\fB$ git map\-branches\fR
-origin/master
- \fBcool_feature *\:\fR
- subfeature
- frozen_changes
- master
-{NO UPSTREAM}
- bogus_noparent
+[alias]
+ git rp = reparent\-branch
.fi
.if n \{\
.RE
@@ -74,7 +59,7 @@ origin/master
.sp
.SH "SEE ALSO"
.sp
-\fBgit-map-branches\fR(1), \fBgit-nav-upstream\fR(1)
+\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(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\&.

Powered by Google App Engine
This is Rietveld 408576698