Merge branch 'rk/send-email-ssl-cert'

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 7ba853eeda96ec9a4b4a3b4ebb8c88dda055c67d..02669b15344c5641c613961104293e22c311aeb1 100644 (file)
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -9,10 +9,10 @@ git-subtree - Merge subtrees together and split repository into subtrees
 SYNOPSIS
 --------
 [verse]
-'git subtree' add   -P <prefix> <refspec>
-'git subtree' add   -P <prefix> <repository> <refspec>
-'git subtree' pull  -P <prefix> <repository> <refspec...>
-'git subtree' push  -P <prefix> <repository> <refspec...>
+'git subtree' add   -P <prefix> <commit>
+'git subtree' add   -P <prefix> <repository> <ref>
+'git subtree' pull  -P <prefix> <repository> <ref>
+'git subtree' push  -P <prefix> <repository> <ref>
 'git subtree' merge -P <prefix> <commit>
 'git subtree' split -P <prefix> [OPTIONS] [<commit>]
 
@@ -68,7 +68,7 @@ COMMANDS
 --------
 add::
        Create the <prefix> subtree by importing its contents
-       from the given <refspec> or <repository> and remote <refspec>.
+       from the given <commit> or <repository> and remote <ref>.
        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
@@ -90,13 +90,13 @@ merge::
        
 pull::
        Exactly like 'merge', but parallels 'git pull' in that
-       it fetches the given commit from the specified remote
+       it fetches the given ref from the specified remote
        repository.
        
 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
+       repository and ref. This can be used to push your
        subtree to different branches of the remote repository.
 
 split::
@@ -270,7 +270,7 @@ git-extensions repository in ~/git-extensions/:
 name
 
 You can omit the --squash flag, but doing so will increase the number
-of commits that are incldued in your local repository.
+of commits that are included in your local repository.
 
 We now have a ~/git-extensions/git-subtree directory containing code
 from the master branch of git://github.com/apenwarr/git-subtree.git