From 926b1ec63ee045503f609e88ca445b94c06bd5d7 Mon Sep 17 00:00:00 2001 From: "David A. Greene" Date: Mon, 9 Apr 2012 22:19:01 -0500 Subject: [PATCH] Fix git-subtree install instructions Update the install instructions to reflect the changes for an integrated git-subtree. Signed-off-by: David A. Greene --- contrib/subtree/INSTALL | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/contrib/subtree/INSTALL b/contrib/subtree/INSTALL index 81ac702ad..7ab0cf450 100644 --- a/contrib/subtree/INSTALL +++ b/contrib/subtree/INSTALL @@ -1,22 +1,28 @@ - HOW TO INSTALL git-subtree ========================== -You simply need to copy the file 'git-subtree.sh' to where -the rest of the git scripts are stored. +First, build from the top source directory. + +Then, in contrib/subtree, run: + + make + make install + make install-doc -From the Git bash window just run: +If you used configure to do the main build the git-subtree build will +pick up those settings. If not, you will likely have to provide a +value for prefix: -install.sh + make prefix= + make prefix= install + make prefix= install-doc -Or if you have the full Cygwin installed, you can use make: +To run tests first copy git-subtree to the main build area so the +newly-built git can find it: -make install + cp git-subtree ../.. -That will make a 'git subtree' (note: space instead of dash) command -available. See the file git-subtree.txt for more. +Then: -You can also install the man page by doing: + make test - make doc - cp git-subtree.1 /usr/share/man/man1/ -- 2.26.2