Merge branch 'ms/subtree-fixlets'

* ms/subtree-fixlets: git-subtree: fix typo in manpage git-subtree: ignore git-subtree executable
git-mirror · Jan 3, 2013 · b81827b · b81827b
2 parents 6fedcd8 + 248a884
commit b81827b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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.