From 242b20dc0ae51719c32776fb5996c5d6cb463928 Mon Sep 17 00:00:00 2001 From: Bryan Larsen Date: Wed, 21 Jul 2010 12:58:05 -0400 Subject: [PATCH] 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. --- git-subtree.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/git-subtree.txt b/git-subtree.txt index 4f715c640..dbcba3134 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. -- 2.26.2