Merge branch 'ms/subtree-fixlets' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:17:10 +0000 (11:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:17:10 +0000 (11:17 -0800)
* ms/subtree-fixlets:
  git-subtree: fix typo in manpage
  git-subtree: ignore git-subtree executable

contrib/subtree/.gitignore
contrib/subtree/git-subtree.txt

index 7e77c9d..91360a3 100644 (file)
@@ -1,4 +1,5 @@
 *~
+git-subtree
 git-subtree.xml
 git-subtree.1
 mainline
index 0c44fda..c5bce41 100644 (file)
@@ -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.