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

Unified Diff: docs/src/git-reparent-branch.txt

Issue 184253003: Add git-reup and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@freeze_thaw
Patch Set: fix pylint 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
« no previous file with comments | « docs/src/git-rename-branch.txt ('k') | docs/src/git-squash-branch.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/src/git-reparent-branch.txt
diff --git a/docs/src/git-reparent-branch.txt b/docs/src/git-reparent-branch.txt
new file mode 100644
index 0000000000000000000000000000000000000000..db33158e8ecf8dd6ef28cd51f5942d97adc92031
--- /dev/null
+++ b/docs/src/git-reparent-branch.txt
@@ -0,0 +1,61 @@
+git-reparent-branch(1)
+=====================
+
+NAME
+----
+git-reparent-branch -
+include::_git-reparent-branch_desc.helper.txt[]
+
+SYNOPSIS
+--------
+[verse]
+'git reparent-branch' <new_parent>
+'git reparent-branch' --lkgr
+'git reparent-branch' --root
+
+DESCRIPTION
+-----------
+
+Change the 'upstream' of the current branch, and then run
+linkgit:git-rebase-update[1] to move the commits in the current branch, as well
+as the commits in all descendant branches, onto the new parent.
+
+`<new_parent>` may be either a local branch, remote branch, OR a tag (such as
+`lkgr`).
+
+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.
+
+
+OPTIONS
+-------
+
+<new_parent>::
+ The new parent to set as the upstream for this branch. May be a branch ref or
+ a tag.
+
+--lkgr::
+ Reparent to track lkgr.
+
+--root::
+ Reparent to track the 'root' branch. Defaults to 'origin/master'. See
+ linkgit:git-new-branch[1]'s CONFIGURATION VARIABLES section..
+
+
+include::_aliases.txt[]
+
+----
+[alias]
+ git rp = reparent-branch
+----
+
+SEE ALSO
+--------
+linkgit:git-rebase-update[1], linkgit:git-rename-branch[1],
+linkgit:git-new-branch[1], linkgit:git-upstream-diff[1]
+
+include::_footer.txt[]
+
+// vim: ft=asciidoc:
« no previous file with comments | « docs/src/git-rename-branch.txt ('k') | docs/src/git-squash-branch.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698