kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ms/subtree-fixlets' into maint 

* ms/subtree-fixlets:
  git-subtree: fix typo in manpage
  git-subtree: ignore git-subtree executable
maint
Junio C Hamano 2013-01-08 11:17:10 -08:00
parent b48b632cda 248a8849fa
commit 4208fa5ce4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/subtree/.gitignore vendored
View File

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

2
contrib/subtree/git-subtree.txt
View 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.