From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Jan 2013 19:17:10 +0000 (-0800)
Subject: Merge branch 'ms/subtree-fixlets' into maint
X-Git-Tag: v1.8.1.1~39
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4208fa5ce44a746edb582898dfa49b2bfa84dbcc?hp=b48b632cda2d8f74524c448027e867089ddcb44a

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 7e77c9d022..91360a3d7f 100644
--- 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 0c44fda011..c5bce41ac7 100644
--- 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.