docs: simplify example 1
The documentation was written prior to Wayne Walter's 2-parameter add. Using 2-parameter add in example 1 makes the example much simpler.
Bryan Larsen committed
Jul 21, 2010 at 12:58 UTC
242b20dc0ae51719c32776fb5996c5d6cb463928
1 file changed
+3
-7
git-subtree.txt
+3
-7
@@ -236,18 +236,14 @@ EXAMPLE 1
236
Let's assume that you have a local repository that you would like
237
to add an external vendor library to. In this case we will add the
238
git-subtree repository as a subdirectory of your already existing
239
-git-extensions repository in ~/git-extensions/.
239
+git-extensions repository in ~/git-extensions/:
240
241
-First we need to fetch the remote objects
242
- $ cd ~/git-extensions
243
- $ git fetch git://github.com/apenwarr/git-subtree.git master
241
+ $ git subtree add --prefix=git-subtree --squash \
242
+ git://github.com/apenwarr/git-subtree.git master
243
244
'master' needs to be a valid remote ref and can be a different branch
245
name
246
248
-Now we add the vendor library with
249
- $ git subtree add --prefix=git-subtree --squash FETCH_HEAD
250
-
247
You can omit the --squash flag, but doing so will increase the number
248
of commits that are incldued in your local repository.
249