Merge branch 'ms/subtree-fixlets' into maint

* ms/subtree-fixlets:
  git-subtree: fix typo in manpage
  git-subtree: ignore git-subtree executable
This commit is contained in:
Junio C Hamano 2013-01-08 11:17:10 -08:00
commit 4208fa5ce4
2 changed files with 2 additions and 1 deletions

View File

@ -1,4 +1,5 @@
*~ *~
git-subtree
git-subtree.xml git-subtree.xml
git-subtree.1 git-subtree.1
mainline mainline

View File

@ -93,7 +93,7 @@ pull::
repository. repository.
push:: 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 and then does a 'git push' to push the result to the
repository and refspec. This can be used to push your repository and refspec. This can be used to push your
subtree to different branches of the remote repository. subtree to different branches of the remote repository.