diff options
| author |  Bryan Larsen <bryan@larsen.st> | 2010-07-21 12:58:05 -0400 |
|---|---|---|
| committer |  Avery Pennarun <apenwarr@gmail.com> | 2010-07-21 13:41:38 -0400 |
| commit | 242b20dc0ae51719c32776fb5996c5d6cb463928 (patch) | |
| tree | 29325e341e702131b712f3695219ef0d80168304 | |
| parent | Another fix for PATH and msysgit. (diff) | |
| download | tgif-242b20dc0ae51719c32776fb5996c5d6cb463928.tar.xz | |
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.
| -rw-r--r-- | git-subtree.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/git-subtree.txt b/git-subtree.txt index 4f715c640b..dbcba31346 100644 --- a/git-subtree.txt +++ b/git-subtree.txt @@ -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. |