Changes between Version 2 and Version 3 of faq/git-for-web-development

Timestamp:

Aug 10, 2011, 7:26:06 AM (14 years ago)

Author:

Mallory Knodel

Comment:

--

faq/git-for-web-development

@@ -2 +2 @@
 These instructions are targeted to Linux operating systems.  If you run Windows or Mac (we suggest switching to an open source OS), you can find instructions for your local machine online.  The instructions for the server will be the same.  For more detailed instructions on using git [http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html go here].  There is another method to achieve the same effect using [http://joemaller.com/990/a-web-focused-git-workflow/ git remote add] that might be useful.
 
- * ssh into your MF/PL server
+ * ssh into your MF/PL server and navigate to your website's directory.
 
-  * Goto your web directory and do:
+  * Initalize your git project with the following three commands:
 {{{
 git init
 git add sites/all
 git commit -am "Initial Import"
+}}}
+  * Now we need to setup the repository's origin. We can do this on the MF/PL server, too, just in the {{{include}}} directory.
+{{{
 cd ../include
 git clone --bare ../web REPONAME.git
+}}}
+  * We need to go back to our original .git repo and edit the {{{config}}} file
+
+{{{
 cd ../web/.git
 }}}
-  * Edit the config file so that it looks like this
+    so that it looks like this:
 {{{
 [core]
@@ -27 +34 @@
         merge = refs/heads/master
 }}}
+ * Navigate back to your web directory, where the .git directory is located, and do a push to your origin:
+{{{
+git push origin master
+}}}
 
- * On Your Local machine
-  * cd into your local directory and do:
+ * Great! Now if you're doing development offline on your local machine, you'll need to set up the repository there, too:
+  * cd into your {{{sites}}} directory (or wherever your have your local projects) and do:
 {{{
 git clone ssh://<USERNAME>@MYSITENAME.org/home/members/MEMBERNAME/sites/MYSITENAME.org/include/REPONAME.git
@@ -41 +52 @@
 git commit -am "Added test-file."
 git push
+}}}
 
   * From server cd into your web directory and do: