What is going on?
git status
git diffAdd all files that are already tracked by the repo that have changes, commit and push to GitHub:
git add -u
git commit -m 'message'
git push origin masterTo start from the start, lets:
- make an empty directory
- make a file
- initialize the repo
- add all files
- commit the changes
git init
touch README.md
git add *
git commit -m 'initial commit'Note that we don't push this anywhere.
Branching is not required on all projects. Sometimes it can be nice to have a stable master branch and to experiment in another branch.
git checkout -b dev
touch dev.py
git add dev.py
git commit -m 'dev work'Now if I want these changes in my master branch:
git checkout master
git merge devGit is a version tracking system that can happily run locally. GitHub will host your git repo and adds additional functionality.
Lets add our practice repo to GitHub (this is done on the GitHub website) - https://github.com/new
We can now push our repo up to Github.
git push -u origin masterA common workflow is where you want to work on someone elses repo and send your changes back to them. One way to do this is to:
- fork their repo to your GitHub
- commit your changes to your forked repo
- open a pull request on GitHub (you can't use the command line for this!)
Git works because it remembers everything - if you commit 10 GB of images it will always be there.
Commands like checkout, reset can overwrite your work - this will happen to you when you are learning.
The best practice is small, regular commits - commit early and often.
There are lots of types of files we don't want in our repos - we can tell git to ignore these using a .gitignore
We can also have global gitignores:
# set a global gitignore
git config --global core.excludesfile '~/.gitignore'
# show global gitignore
git config --get core.excludesfile