Prepare for rename git-follow -> git-rebase-subtree

6 files changed, 66 insertions, 41 deletions

diff --git a/NEWS b/NEWS
index 4f9f51c..2b14801 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-ndim-git-utils 1.14.1
+ndim-git-utils 1.14.2
 
 
 ndim-git-utils 1.14
diff --git a/configure.ac b/configure.ac
index c12a80c..e9efe8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 
 AC_PREREQ(2.61)
 AC_INIT([ndims git utilities],
-	[1.14.1],
+	[1.14.2],
 	[hun@n-dimensional.de],
 	[ndim-git-utils])
 AC_CONFIG_AUX_DIR([auto-aux])
@@ -27,6 +27,7 @@ AC_CONFIG_FILES([git-amb/git-amb.man])
 AC_CONFIG_FILES([git-amb/git-amb])
 AC_CONFIG_FILES([git-buildmsg/git-buildmsg])
 AC_CONFIG_FILES([git-follow/git-follow])
+AC_CONFIG_FILES([git-follow/git-rebase-subtree.man])
 AC_CONFIG_FILES([git-ndim-sh/git-ndim-sh])
 AC_OUTPUT
 
diff --git a/git-amb/git-amb.man.in b/git-amb/git-amb.man.in
index 3cf4b37..2ddd630 100644
--- a/git-amb/git-amb.man.in
+++ b/git-amb/git-amb.man.in
@@ -1,6 +1,6 @@
 .TH GIT-AMB 1 "@PACKAGE_TARNAME@ @PACKAGE_VERSION@" "2007\-11\-02" "@PACKAGE_NAME@ @PACKAGE_VERSION@"
 .SH NAME
-git-amb \- git automake build utitilty
+git\-amb \- git automake build utitilty
 .SH SYNOPSIS
 .B "git\-amb"
 .RB "command"
diff --git a/git-follow/Makefile-files b/git-follow/Makefile-files
index 26d78b9..8290654 100644
--- a/git-follow/Makefile-files
+++ b/git-follow/Makefile-files
@@ -2,3 +2,12 @@
 bin_SCRIPTS  += git-follow/git-follow
 EXTRA_DIST   += git-follow/git-follow.in
 UPLOAD_FILES += git-follow/git-follow
+
+man1_MANS  += git-follow/git-rebase-subtree.man
+EXTRA_DIST += git-follow/git-rebase-subtree.man.in
+
+if HAVE_NDIM_MAN2TXT
+dist_doc_DATA += git-follow/git-rebase-subtree.txt
+CLEANFILES    += git-follow/git-rebase-subtree.txt
+UPLOAD_FILES  += git-follow/git-rebase-subtree.txt
+endif
diff --git a/git-follow/git-follow.in b/git-follow/git-follow.in
index b98aa1d..d2422ab 100644
--- a/git-follow/git-follow.in
+++ b/git-follow/git-follow.in
@@ -1,43 +1,5 @@
 #!/bin/sh
 #
-# Note: Letters A-Z are branch names, not revs.
-#
-# Old tree:
-#                        *--F
-#                       /
-#     origin=master--A--B--G
-#                    \
-#                     *--D--H
-#                         \
-#                          *--*--K
-#
-# Set "git config follow.tree" to:
-#   master A
-#   A B
-#   B F
-#   B G
-#   A D
-#   D H
-#   D K
-#
-# After "git-fetch -v":
-#                        *--F
-#                       /
-#           master---A--B--G
-#            \        \
-#             *        *--D--H
-#              \           \
-#               *--origin'  *--*--K
-#
-# After "git-rebase-subtree origin master":
-#
-#                          *'--F'
-#                         /
-#   origin'=master'--A'--B'--G'
-#                     \
-#                      *'--D'--H'
-#                          \
-#                           *'--*'--K'
 
 unset CDPATH
 SED="${SED-sed}"
diff --git a/git-follow/git-rebase-subtree.man.in b/git-follow/git-rebase-subtree.man.in
new file mode 100644
index 0000000..9f51432
--- /dev/null
+++ b/git-follow/git-rebase-subtree.man.in
@@ -0,0 +1,53 @@
+.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).