{"thread":{"id":"33134","subject":"[PATCH 15/19] Document from-submodule and prune commands","startedAt":"2013-03-09T19:29:20Z","lastAt":"2013-03-09T19:29:20Z","messageCount":1,"participants":["Paul Campbell"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"210923","messageId":"CALeLG_kmQdyoHokna-Mg3ctFDDVxLwFLHKMcC8PDk99-Ez1+Rg@mail.gmail.com","threadId":"33134","inReplyTo":null,"subject":"[PATCH 15/19] Document from-submodule and prune commands","fromName":"Paul Campbell","fromEmail":"pcampbell@kemitix.net","sentAt":"2013-03-09T19:29:20Z","receivedAt":"2013-03-09T19:29:20Z","isPatch":true,"sender":{"key":"pcampbell@kemitix.net","avatar":"https://gravatar.com/avatar/57584e05501b694929004e43fcd7308f4ad64df2eb0474cd8c7e5f93662bb0f1?d=mp&s=160"},"body":">From 6dc8119a7d99f7107e32f2c5d7ec18b9fd93a6b8 Mon Sep 17 00:00:00 2001\nFrom: Herman van Rink <rink@initfour.nl>\nDate: Tue, 27 Mar 2012 14:14:54 +0200\nSubject: [PATCH 15/19] Document from-submodule and prune commands\n\n---\n contrib/subtree/git-subtree.txt | 10 ++++++++++\n 1 file changed, 10 insertions(+)\n\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex c8fc103..48ba158 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -129,6 +129,16 @@ split::\n \tNote that if you use '--squash' when you merge, you\n \tshould usually not just '--rejoin' when you split.\n\n+from-submodule::\n+\tConvert a git submodule to a subtree.\n+\tThe module is removed from the .gitmodules file and\n+\tthe repo contents are integrated as a subtree.\n+\n+prune::\n+\tCleanup .gittrees entries for which the subtree nolonger exists.\n+\n+diff::\n+\tTO BE DOCUMENTED\n\n OPTIONS\n -------\n-- \n1.8.2.rc1\n\n\n-- \nPaul [W] Campbell\n"}]}