User:Crutchy

From SoylentNews
Revision as of 19:49, 23 July 2014 by Crutchy (talk | contribs) (Git/GitHub)

Jump to: navigation, search

I'm just a regular pleb from Australia. I'm not a member of the Soylent staff.

PHP/SQL/HTML/CSS and Delphi (Object Pascal) are my preferred languages.

Look out for me on Soylent IRC (#Soylent,##,#test)

Git/GitHub

$ git config --global user.name "crutchy-"
$ git config --global user.email ""
$ git config --global credential.helper cache
$ git config --global credential.helper 'cache --timeout=3600'
$ git clone https://github.com/crutchy-/slashcode.git

When a repository is cloned, it has a default remote called "origin" that points to your fork on GitHub, not the original repository it was forked from. To keep track of the original repository, you need to add another remote named "upstream"

$ git remote add upstream https://github.com/SoylentNews/slashcode.git

Fetch any new changes from the original repository:

$ git fetch upstream

Merge any changes fetched into your working files:

$ git merge upstream/master