>From 483a644fb40d14f2209116c45c1cb6beab11a181 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Tue, 12 Feb 2013 00:07:26 +0000
Subject: [PATCH 4/4] contrib/subtree: update documentation
Signed-off-by: Paul Campbell <pcampbell@kemitix.net>
---
contrib/subtree/git-subtree.txt | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
Show changes to contrib/subtree/git-subtree.txt +9 −4
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 <prefix> <commit>
-'git subtree' pull -P <prefix> <repository> <refspec...>
-'git subtree' push -P <prefix> <repository> <refspec...>
+'git subtree' pull -P <prefix> [<repository> <refspec...>]
+'git subtree' push -P <prefix> [<repository> <refspec...>]
'git subtree' merge -P <prefix> <commit>
'git subtree' split -P <prefix> [OPTIONS] [<commit>]
@@ -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 <prefix> are added to the
+ .gitsubtree file, where they will be used as defaults for
+ 'push' and 'pull'.
merge::
Merge recent changes up to <commit> into the <prefix>
@@ -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 <repository> and <refspec>
+ are taken from the .gitsubtree file.
push::
Does a 'split' (see below) using the <prefix> 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 <repository> and <refspec> are taken
+ from the .gitsubtree file.
split::
Extract a new, synthetic project history from the
--
1.8.1.3.566.gaa39828
Paul Campbell