{"thread":{"id":"32895","subject":"[PATCH 4/4] contrib/subtree: update documentation","startedAt":"2013-02-12T23:24:20Z","lastAt":"2013-02-12T23:24:20Z","messageCount":1,"participants":["Paul Campbell"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"209440","messageId":"CALeLG_k2diZ9WdE5Mpwv7u2_wd0vp2o1vrbFwDzXyeg+x5gtzA@mail.gmail.com","threadId":"32895","inReplyTo":null,"subject":"[PATCH 4/4] contrib/subtree: update documentation","fromName":"Paul Campbell","fromEmail":"pcampbell@kemitix.net","sentAt":"2013-02-12T23:24:20Z","receivedAt":"2013-02-12T23:24:20Z","isPatch":true,"sender":{"key":"pcampbell@kemitix.net","avatar":"https://gravatar.com/avatar/57584e05501b694929004e43fcd7308f4ad64df2eb0474cd8c7e5f93662bb0f1?d=mp&s=160"},"body":">From 483a644fb40d14f2209116c45c1cb6beab11a181 Mon Sep 17 00:00:00 2001\nFrom: Paul Campbell <pcampbell@kemitix.net>\nDate: Tue, 12 Feb 2013 00:07:26 +0000\nSubject: [PATCH 4/4] contrib/subtree: update documentation\n\nSigned-off-by: Paul Campbell <pcampbell@kemitix.net>\n---\n contrib/subtree/git-subtree.txt | 13 +++++++++----\n 1 file changed, 9 insertions(+), 4 deletions(-)\n\ndiff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt\nindex c5bce41..67dea3f 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -10,8 +10,8 @@ SYNOPSIS\n --------\n [verse]\n 'git subtree' add   -P <prefix> <commit>\n-'git subtree' pull  -P <prefix> <repository> <refspec...>\n-'git subtree' push  -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@@ -71,7 +71,9 @@ add::\n \tA new commit is created\tautomatically, joining the imported\n \tproject's history with your own.  With '--squash', imports\n \tonly a single commit from the subproject, rather than its\n-\tentire history.\n+\tentire history. Details of the <prefix> are added to the\n+\t.gitsubtree file, where they will be used as defaults for\n+\t'push' and 'pull'.\n\n merge::\n \tMerge recent changes up to <commit> into the <prefix>\n@@ -90,13 +92,16 @@ merge::\n pull::\n \tExactly like 'merge', but parallels 'git pull' in that\n \tit fetches the given commit from the specified remote\n-\trepository.\n+\trepository. Default values for <repository> and <refspec>\n+\tare taken from the .gitsubtree file.\n \t\n push::\n \tDoes a 'split' (see below) using the <prefix> supplied\n \tand then does a 'git push' to push the result to the\n \trepository and refspec. This can be used to push your\n \tsubtree to different branches of the remote repository.\n+\tDefault values for <repository> and <refspec> are taken\n+\tfrom the .gitsubtree file.\n\n split::\n \tExtract a new, synthetic project history from the\n-- \n1.8.1.3.566.gaa39828\n"}]}