From 065882698b0c31f12f7bdbdcf0562c1c6d318f7e Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Wed, 7 Nov 2007 20:18:33 +0100
Subject: git-rebase-subtree: support reverse operation

---
 git-rebase-subtree/git-rebase-subtree.man.in | 48 ++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

(limited to 'git-rebase-subtree/git-rebase-subtree.man.in')

diff --git a/git-rebase-subtree/git-rebase-subtree.man.in b/git-rebase-subtree/git-rebase-subtree.man.in
index 295dfc5..01a21cb 100644
--- a/git-rebase-subtree/git-rebase-subtree.man.in
+++ b/git-rebase-subtree/git-rebase-subtree.man.in
@@ -5,6 +5,11 @@ git\-rebase\-subtree \- rebase set of interdependant git branches
 .B "git\-rebase\-subtree"
 .I "<origin-branch>"
 .I "<master-branch>"
+.PP
+.B "git\-rebase\-subtree"
+.I "\-\-reverse"
+.I "<master-branch>"
+.I "<master-branch-plus-x>"
 .SH DESCRIPTION
 So you are tracking some upstream's git repo and maintain your own set
 of interdependent feature branches ("branch subtree").
@@ -19,8 +24,8 @@ Note: Letters A\-Z are branch names, not revs.
 .PP
 Old tree:
 .nf
-                       *\-\-F
-                      /
+                        *\-\-F
+                       /
     origin=master\-\-A\-\-B\-\-G
                     \\
                      *\-\-D\-\-H
@@ -28,6 +33,18 @@ Old tree:
                           *\-\-*\-\-K
 .fi
 .PP
+Generate the following configuration using
+.I "git config rebase-subtree.subtree"
+.nf
+  master A
+  A B
+  B F
+  B G
+  A D
+  D H
+  D K
+.fi
+.PP
 After "git\-fetch \-v":
 .nf
                          *\-\-F
@@ -46,8 +63,35 @@ After hypothetical "git\-rebase\-subtree origin master":
    origin'=master'\-\-A'\-\-B'\-\-G'
                      \\
                       *'\-\-D'\-\-H'
+                           \\
+                            *'\-\-*'\-\-K'
+.fi
+.SS "REVERSE OPERATION"
+.PP
+Old tree:
+.nf
+                        *\-\-F
+                       /
+        master\-\-Y\-\-A\-\-B\-\-G
+                    \\
+                     *\-\-D\-\-H
+                         \\
+                          *\-\-*\-\-K
+.fi
+.PP
+After hypothetical "git\-rebase\-subtree \-\-reverse master Y":
+.nf
+                  Y      *'\-\-F'
+                 /      /
+           master\-\-A'\-\-B'\-\-G'
+                    \\
+                     *'\-\-D'\-\-H'
                           \\
                            *'\-\-*'\-\-K'
 .fi
+.SH "BUGS"
+.TP
+.B "Lacks generality (fixation about 'master')"
+Yes.
 .SH "SEE ALSO"
 git\-rebase(1).
-- 
cgit