>From 6dc8119a7d99f7107e32f2c5d7ec18b9fd93a6b8 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Tue, 27 Mar 2012 14:14:54 +0200
Subject: [PATCH 15/19] Document from-submodule and prune commands
---
contrib/subtree/git-subtree.txt | 10 ++++++++++
1 file changed, 10 insertions(+)
Show changes to contrib/subtree/git-subtree.txt +10 −0
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index c8fc103..48ba158 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -129,6 +129,16 @@ split::
Note that if you use '--squash' when you merge, you
should usually not just '--rejoin' when you split.
+from-submodule::
+ Convert a git submodule to a subtree.
+ The module is removed from the .gitmodules file and
+ the repo contents are integrated as a subtree.
+
+prune::
+ Cleanup .gittrees entries for which the subtree nolonger exists.
+
+diff::
+ TO BE DOCUMENTED
OPTIONS
-------
--
1.8.2.rc1
--
Paul [W] Campbell
Paul Campbell