summaryrefslogtreecommitdiffstats
path: root/git-follow/git-rebase-subtree.man.in
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2007-11-07 18:40:27 +0100
committerHans Ulrich Niedermann <hun@n-dimensional.de>2007-11-07 18:40:27 +0100
commitc6d8622c527ab58018928c617d03f747cef9a70b (patch)
treee985f157144d7d608e4af3e4d203b0d5056c53c3 /git-follow/git-rebase-subtree.man.in
parent797dc152f1885e9eee2c8826a491a52ef2f61699 (diff)
downloadndim-git-utils-c6d8622c527ab58018928c617d03f747cef9a70b.tar.gz
ndim-git-utils-c6d8622c527ab58018928c617d03f747cef9a70b.tar.xz
ndim-git-utils-c6d8622c527ab58018928c617d03f747cef9a70b.zip
Completed rename to git-rebase-subtree
Diffstat (limited to 'git-follow/git-rebase-subtree.man.in')
-rw-r--r--git-follow/git-rebase-subtree.man.in53
1 files changed, 0 insertions, 53 deletions
diff --git a/git-follow/git-rebase-subtree.man.in b/git-follow/git-rebase-subtree.man.in
deleted file mode 100644
index 9f51432..0000000
--- a/git-follow/git-rebase-subtree.man.in
+++ /dev/null
@@ -1,53 +0,0 @@
-.TH GIT-REBASE-SUBTREE 1 "@PACKAGE_TARNAME@ @PACKAGE_VERSION@" "2007\-11\-02" "@PACKAGE_NAME@ @PACKAGE_VERSION@"
-.SH NAME
-git\-rebase\-subtree \- rebase set of interdependant git branches
-.SH SYNOPSIS
-.B "git\-rebase\-subtree"
-.I "<origin-branch>"
-.I "<master-branch>"
-.SH DESCRIPTION
-So you are tracking some upstream's git repo and maintain your own set
-of interdependent feature branches ("branch subtree").
-.PP
-And you want to keep that "branch subtree" up-to-date in relation to
-upstream so it stays sweet, small, and clean, increasing the chances
-that upstream will finally pick something up from it.
-.PP
-Initial situation: Local branch master tracks remote origin.
-.PP
-Note: Letters A\-Z are branch names, not revs.
-.PP
-Old tree:
-.nf
- *\-\-F
- /
- origin=master\-\-A\-\-B\-\-G
- \\
- *\-\-D\-\-H
- \\
- *\-\-*\-\-K
-.fi
-.PP
-After "git\-fetch \-v":
-.nf
- *\-\-F
- /
- master\-\-\-A\-\-B\-\-G
- \\ \\
- * *\-\-D\-\-H
- \\ \\
- origin' *\-\-*\-\-K
-.fi
-.PP
-After hypothetical "git\-rebase\-subtree origin master":
-.nf
- *'\-\-F'
- /
- origin'=master'\-\-A'\-\-B'\-\-G'
- \\
- *'\-\-D'\-\-H'
- \\
- *'\-\-*'\-\-K'
-.fi
-.SH "SEE ALSO"
-git\-rebase(1).