|
|
| Line 3: |
Line 3: |
| PHP/SQL/HTML/CSS and Delphi (Object Pascal) are my preferred languages.<br> | | PHP/SQL/HTML/CSS and Delphi (Object Pascal) are my preferred languages.<br> |
|
| |
|
| Look out for me on Soylent IRC (#Soylent,##,#test)<br> | | Look out for me on Soylent IRC (#Soylent and #)<br> |
| | |
| ==Git/GitHub==
| |
| | |
| <pre>
| |
| $ 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
| |
| </pre>
| |
| | |
| 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"
| |
| | |
| <pre>$ git remote add upstream https://github.com/SoylentNews/slashcode.git</pre>
| |
| | |
| Fetch any new changes from the original repository:
| |
| <pre>$ git fetch upstream</pre>
| |
| | |
| Merge any changes fetched into your working files:
| |
| <pre>$ git merge upstream/master</pre>
| |
Revision as of 12:18, 14 September 2014
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 and #)