{"thread":{"id":"33135","subject":"[PATCH 16/19] Update SYNOPSIS","startedAt":"2013-03-09T19:29:52Z","lastAt":"2013-03-09T19:29:52Z","messageCount":1,"participants":["Paul Campbell"],"isPatch":true,"patchVersion":1,"patchTotal":19},"messages":[{"id":"210924","messageId":"CALeLG_=A8G76ALi3gNpQsKfhVW7BbZA=HiMWSuUuNBXDwU_t6w@mail.gmail.com","threadId":"33135","inReplyTo":null,"subject":"[PATCH 16/19] Update SYNOPSIS","fromName":"Paul Campbell","fromEmail":"pcampbell@kemitix.net","sentAt":"2013-03-09T19:29:52Z","receivedAt":"2013-03-09T19:29:52Z","isPatch":true,"sender":{"key":"pcampbell@kemitix.net","avatar":"https://gravatar.com/avatar/57584e05501b694929004e43fcd7308f4ad64df2eb0474cd8c7e5f93662bb0f1?d=mp&s=160"},"body":">From 6024d877e6c3beebe4c11bd060553d06af422680 Mon Sep 17 00:00:00 2001\nFrom: Paul Campbell <pcampbell@kemitix.net>\nDate: Sat, 9 Mar 2013 18:34:54 +0000\nSubject: [PATCH 16/19] Update SYNOPSIS\n\nConflicts:\n\tcontrib/subtree/git-subtree.txt\n\nOriginal-Author: Herman van Rink <rink@initfour.nl>\nConflicts-resolved-by: Paul Campbell <pcampbell@kemitix.net>\n---\n contrib/subtree/git-subtree.txt | 17 ++++++++++-------\n 1 file changed, 10 insertions(+), 7 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex 48ba158..b485ab5 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -9,13 +9,16 @@ git-subtree - Merge subtrees together and split\nrepository into subtrees\n SYNOPSIS\n --------\n [verse]\n-'git subtree' add   -P <prefix> <refspec>\n-'git subtree' add   -P <prefix> <repository> <refspec>\n-'git subtree' pull  -P <prefix> <repository> <refspec...>\n-'git subtree' push  -P <prefix> <repository> <refspec...>\n-'git subtree' merge -P <prefix> <commit>\n-'git subtree' split -P <prefix> [OPTIONS] [<commit>]\n-\n+'git subtree' add   --prefix=<prefix> <repository> <refspec>\n+'git subtree' merge --prefix=<prefix> <commit>\n+'git subtree' pull  --prefix=<prefix> [<repository> [<refspec>...]]\n+'git subtree' pull-all\n+'git subtree' push-all\n+'git subtree' push  --prefix=<prefix> [<repository> [<refspec>...]]\n+'git subtree' split --prefix=<prefix> <commit...>\n+'git subtree' from-submodule --prefix=<prefix>\n+'git subtree' prune\n+'git subtree' diff  --prefix=<prefix> [<repository> [<refspec>...]]\n\n DESCRIPTION\n -----------\n-- \n1.8.2.rc1\n\n\n-- \nPaul [W] Campbell\n"}]}