summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7f86ff0)
raw | patch | inline | side by side (parent: 7f86ff0)
author | Avery Pennarun <apenwarr@gmail.com> | |
Thu, 21 Oct 2010 19:28:18 +0000 (12:28 -0700) | ||
committer | Avery Pennarun <apenwarr@gmail.com> | |
Thu, 21 Oct 2010 19:28:18 +0000 (12:28 -0700) |
git-subtree.txt | patch | blob | history |
diff --git a/git-subtree.txt b/git-subtree.txt
index 18a9af501fd45ecb88e1cfce424c7fa1b2e2f355..0c44fda011bcfd39fd8c464c35017df620a91ff9 100644 (file)
--- a/git-subtree.txt
+++ b/git-subtree.txt
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
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