global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 11:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

docs: simplify example 1

Browse Source 
The documentation was written prior to Wayne Walter's 2-parameter add.
Using 2-parameter add in example 1 makes the example much simpler.
This commit is contained in:
Bryan Larsen
2010-07-21 12:58:05 -04:00
committed by Avery Pennarun
parent df2302d774
commit 242b20dc0a
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
git-subtree.txt
View File

@@ -236,18 +236,14 @@ EXAMPLE 1
Let's assume that you have a local repository that you would like
to add an external vendor library to. In this case we will add the
git-subtree repository as a subdirectory of your already existing
git-extensions repository in ~/git-extensions/.
git-extensions repository in ~/git-extensions/:
First we need to fetch the remote objects
$ cd ~/git-extensions
$ git fetch git://github.com/apenwarr/git-subtree.git master
$ git subtree add --prefix=git-subtree --squash \
git://github.com/apenwarr/git-subtree.git master
'master' needs to be a valid remote ref and can be a different branch
name
Now we add the vendor library with
$ git subtree add --prefix=git-subtree --squash FETCH_HEAD
You can omit the --squash flag, but doing so will increase the number
of commits that are incldued in your local repository.