Merge branch 'ms/subtree-fixlets' into maint

* ms/subtree-fixlets:
git-subtree: fix typo in manpage
git-subtree: ignore git-subtree executable

diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 7e77c9d0229e949c034c8c46811e19d2325e9cca..91360a3d7f0ad2d589dfe0365d4456d56853e7c0 100644 (file)
--- a/contrib/subtree/.gitignore
+++ b/contrib/subtree/.gitignore
@@ -1,4 +1,5 @@
 *~
+git-subtree
 git-subtree.xml
 git-subtree.1
 mainline

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 0c44fda011bcfd39fd8c464c35017df620a91ff9..c5bce41ac7ccd88013f3de3c663f980d2277938c 100644 (file)
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -93,7 +93,7 @@ pull::
        repository.
        
 push::
-       Does a 'split' (see above) using the <prefix> supplied
+       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.