mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 08:08:16 +02:00
Code

Fix a few typos/grammar-o's in the preceding commit.

Browse Source
This commit is contained in:
Avery Pennarun 2010-10-21 12:28:18 -07:00
parent 7f86ff0fe2
commit 9a40fcc201
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-subtree.txt
View File

@ -9,11 +9,11 @@ git-subtree - Merge subtrees together and split repository into subtrees
SYNOPSIS
--------
[verse]
'git subtree' add -P <prefix>|--prefix=<prefix> <commit>
'git subtree' pull -P <prefix>|--prefix=<prefix> <repository> <refspec...>
'git subtree' push -P <prefix>|--prefix=<prefix> <repository> <refspec...>
'git subtree' merge -P <prefix>|--prefix=<prefix> <commit>
'git subtree' split -P <prefix>|--prefix=<prefix> [OPTIONS] [<commit>]
'git subtree' add -P <prefix> <commit>
'git subtree' pull -P <prefix> <repository> <refspec...>
'git subtree' push -P <prefix> <repository> <refspec...>
'git subtree' merge -P <prefix> <commit>
'git subtree' split -P <prefix> [OPTIONS] [<commit>]
DESCRIPTION
@ -34,9 +34,9 @@ work. A subtree is just a subdirectory that can be
committed to, branched, and merged along with your project in
any way you want.
They are neither not to be confused with using the subtree merge
They are also not to be confused with using the subtree merge
strategy. The main difference is that, besides merging
of the other project as a subdirectory, you can also extract the
the other project as a subdirectory, you can also extract the
entire history of a subdirectory from your project and make it
into a standalone project. Unlike the subtree merge strategy
you can alternate back and forth between these