mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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:
commit
4208fa5ce4
1
contrib/subtree/.gitignore
vendored
1
contrib/subtree/.gitignore
vendored
|
@ -1,4 +1,5 @@
|
|||
*~
|
||||
git-subtree
|
||||
git-subtree.xml
|
||||
git-subtree.1
|
||||
mainline
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue