Working with Git

Firstly if you are using Windows, uninstall it.

When you have a proper operating system crack open the terminal and run:

  $ mkdir pyrocms
  $ cd pyrocms
  $ git init
-- Collaborators repository
  $ git remote add origin git@github.com:philsturgeon/pyrocms.git
-- Read-only public repository
  $ git remote add origin git://github.com/philsturgeon/pyrocms.git
  $ git pull origin master

This will get you a copy of PyroCMS. “origin” is a name you have assigned to the remote repository git@github.com:philsturgeon/pyrocms.git, and master is the main “trunk” or working branch.

Now do stuff.

When stuff is done, find out what files are changed, add / remove the correct files and commit.

  $ git status
  $ git add somefile
  $ git add somefolder/ 
  $ git rm afile andanotherfile
  $ git rm -r wholefolder/
  $ git commit -m "bug: I fixed something

When you have commited this, it doesn't actually go anywhere. You have to push your work for that to happen. This means you can “commit” lots of work, but only send it all off when you are ready. Means multiple commits to secure what you have done, but the rest of the world isn’t lumbered with incomplete work until you are ready!

  $ git push origin master

If that says “rejected” anywhere it is most likely that your copy is out of date. Pull the latest copy, then try agian.

  $ git pull origin master

If you have anything to “revert” (meaning undo back to how it was before you edited it) then you can do this:

  $ git checkout -- filepath/filename.php