Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Fo' Paws website
Ruby Shell
branch: master

Fetching latest commit…

Cannot retrieve the latest commit at this time

Failed to load latest commit information.
assets
data
doc
script
site
templates
.gitignore
README
bcon_stitch.pdf
designs2.txt
designs2.yml
web process instructions.doc

README

Fo' Paws Productions website generator

USING GIT

You have to deal with three repositories of data:
- Your local copy where you make changes
- Your github repository (under the fopaws account)
- My github repository (under my tilthouse account)

Your basic workflow when you want to make changes will be to:
1) Pull changes from my repository to your local one
2) Push those changes from your local repository to your (fopaws) github repository
3) Make your changes, edits, add, delete, and move files
4) Commit those changes to your local repository
5) Push that changeset to your (fopaws) github repository
6) Notify me (via github) that I need to update my (tilthouse) version of the repository

Here are the commands for each step.  You will need to open iTerm or Terminal and type these at the command prompt.  The dollar sign ($) is the command prompt.  I will show it below to indicate text you are to type in the terminal, but don't type the dollar sign itself.

1) Pull changes from my repository to your local one

	$ git pull tilthouse-fopaws master

2) Push those changes from your local repository to your (fopaws) github repository

	$ git push

3) Make your changes, edits, add, delete, and move files.  Any new files must be added to the repository with:

	$ git add [filenames ...]

You can add whole directories, use wildcards, etc.  The best way to move or delete files in the repository is to use git to do it (then it knows about the changes and no further actions are needed).  To move with git:

	$ git mv [old-filename] [new-filename]

or

	$ git rm [filename]

If these files are out of date you may 

4) Commit those changes to your local repository


5) Push that changeset to your (fopaws) github repository


6) Notify me (via github) that I need to update my (tilthouse) version of the repository

	
TO SET UP A LOCAL REPOSITORY ON A NEW COMPUTER

First you need to install git.  On Mac OS X Leopard, this is easy, you can google for an installer.  On Tiger, it must be compiled.

Go to where you want the fopaws.com directory created (it should be created for you under your current directory when you run the commands).  For example, if you want it under your Documents directory, change to that directory with:

	$ cd ~/Documents
	
Then clone your github repository:

	$ git clone git@github.com:fopaws/fopaws.com.git

Then let git know about my github repository:

	$ git remote add tilthouse-fopaws git://github.com/tilthouse/fopaws.com.git

You will also need to add SSH keys from your account on this new computer.  Directions are online at
	
	http://github.com/guides/providing-your-ssh-key

Something went wrong with that request. Please try again.