From: Paul Campbell Date: Tue, 12 Feb 2013 23:24:20 GMT Subject: [PATCH 4/4] contrib/subtree: update documentation Message-ID: >From 483a644fb40d14f2209116c45c1cb6beab11a181 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Tue, 12 Feb 2013 00:07:26 +0000 Subject: [PATCH 4/4] contrib/subtree: update documentation Signed-off-by: Paul Campbell --- contrib/subtree/git-subtree.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index c5bce41..67dea3f 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -10,8 +10,8 @@ SYNOPSIS -------- [verse] 'git subtree' add -P -'git subtree' pull -P -'git subtree' push -P +'git subtree' pull -P [ ] +'git subtree' push -P [ ] 'git subtree' merge -P 'git subtree' split -P [OPTIONS] [] @@ -71,7 +71,9 @@ add:: A new commit is created automatically, joining the imported project's history with your own. With '--squash', imports only a single commit from the subproject, rather than its - entire history. + entire history. Details of the are added to the + .gitsubtree file, where they will be used as defaults for + 'push' and 'pull'. merge:: Merge recent changes up to into the @@ -90,13 +92,16 @@ merge:: pull:: Exactly like 'merge', but parallels 'git pull' in that it fetches the given commit from the specified remote - repository. + repository. Default values for and + are taken from the .gitsubtree file. push:: Does a 'split' (see below) using the supplied and then does a 'git push' to push the result to the repository and refspec. This can be used to push your subtree to different branches of the remote repository. + Default values for and are taken + from the .gitsubtree file. split:: Extract a new, synthetic project history from the -- 1.8.1.3.566.gaa39828