Git and GitHub
Look up Software Carpentry for a good introduction to Git/GitHub
Setup
- GitHub is an online code repository
- Create a new repo on GitHub
- Open the terminal
git clone [your repo]
Use
git status
- Add files, change files
git add . \\use the dot to mean everything, or name the files
git commit -m ["add commit message here"]
git push
git status
Customise
- To ignore files/folders, add them to the .gitignore file
- Then git add, commit, push this file to update
- For general settings, e.g. set the text editor, change the .gitconig file in your home directory
- Example config file: https://gist.github.com/pksunkara/988716
Work on a someone else’s repo, send pull request
- Find it in GitHub; fork it to your own repo
- In the terminal, git clone the forked repo
- Add, commit and push your changes to your repo
- There may have been other changes in the original repo, so your copy may be out of date
- If so, bring your copy up to date (sync with upstream):
git remote add upstream [the upstream repo]
git fetch upstream
git merge upstream/master
- Resolve any merge conflicts
- In GitHub, open your repo(=a fork of the original repo)
- Create a pull request to the original repository
- If your fork is up to date, you should see “These branches can be automatically merged”.
Remember:
- Always keep a local copy of your repositories.
- GitHub is really designed for sharing code, not guaranteed storage.