From: Paul Campbell Date: Sun, 10 Mar 2013 23:41:25 GMT Subject: [PATCH v2 17/23] contrib/subtree: Document from-submodule and prune commands Message-ID: <1362958891-26941-18-git-send-email-pcampbell@kemitix.net> In-Reply-To: <1362958891-26941-1-git-send-email-pcampbell@kemitix.net> From: Herman van Rink Signed-off-by: Paul Campbell --- contrib/subtree/git-subtree.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) 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