{"thread":{"id":"32943","subject":"[PATCH v2 3/3] contrib/subtree: update documentation","startedAt":"2013-02-19T12:32:04Z","lastAt":"2013-02-19T12:32:04Z","messageCount":1,"participants":["Paul Campbell"],"isPatch":true,"patchVersion":2,"patchTotal":3},"messages":[{"id":"209816","messageId":"CALeLG_k2M=BJouYWyk_JB0HX6N++pERJ39tGZ8=oOSDkspASUw@mail.gmail.com","threadId":"32943","inReplyTo":null,"subject":"[PATCH v2 3/3] contrib/subtree: update documentation","fromName":"Paul Campbell","fromEmail":"pcampbell@kemitix.net","sentAt":"2013-02-19T12:32:04Z","receivedAt":"2013-02-19T12:32:04Z","isPatch":true,"sender":{"key":"pcampbell@kemitix.net","avatar":"https://gravatar.com/avatar/57584e05501b694929004e43fcd7308f4ad64df2eb0474cd8c7e5f93662bb0f1?d=mp&s=160"},"body":"Indicate that repository and refspec are now optional on push and pull.\n\nAdd notes to add, push and pull about storing values in .gitsubtree\nand their use as default values.\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 7ba853e..2ad9278 100644\n--- a/contrib/subtree/git-subtree.txt\n+++ b/contrib/subtree/git-subtree.txt\n@@ -11,8 +11,8 @@ SYNOPSIS\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' 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@@ -72,7 +72,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@@ -91,13 +93,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.2.rc0.16.g20a599e\n"}]}