K-State ACM
Git Tutorial
Image Source: Git
Git
- SCM: "Source Control Management"
- Track changes & revisions
- Stage and commit changes
- Branch and merge code
- Local and Distributed
- Social Coding on Github
Where do I start?
Installing Git
- Debian/Ubuntu: sudo apt-get install git
- RedHat/Fedora: sudo yum install git
- Mac: http://git-scm.com/downloads
- Mac: XCode Command Line Tools
- Win: http://git-scm.com/downloads
- Mac/Win: https://desktop.github.com/
- Win: https://tortoisegit.org/ (old)
Learning Git
- https://try.github.io
- http://git-scm.com/doc
- Many classes on Udacity, Udemy, CodeSchool, etc.
Git Level 1 - Local
- git init
- git status
- create a file
- git status
- git add <filename>
- git commit -m "<message>"
- git log <filename>
Git Level 2 - Remote
- Make a repository on GitHub
- git remote add origin https://github.com/<username>/<repo>.git
- git push -u origin master
- If this is your first time, configure
- git pull origin master
- git pull vs. git fetch
Git Level 3 - Diff
- git diff HEAD
- create/change a file
- git add .
- git diff --staged
- git reset <filename>
- git checkout -- <filename>
Git Level 4 - Branching
- git branch <branch_name>
- git checkout <branch_name>
- make changes
- git mv <old_file> <new_file>
- git rm <file>
- git commit -m "<message>"
Git Level 5 - Merging
- git checkout master
- git merge <branch_name>
- git branch -d <branch_name>
- git tag -a <name> -m "<message>"
- git push
Miniboss! - Conflicts
the number of planets are
<<<<<<< HEAD
nine
=======
eight
>>>>>>> branch-a
- fix the file
- git add <file>
- git commit -m "<message>"
Git Level 6 - Advanced Git
- .gitignore - Ignore files
- README.md
- LICENSE
- .git folder DO NOT TOUCH
- GitHub pages: https://pages.github.com/
- SSH Keys
Git Level 7 - Pro Git
- git rebase - Apply upstream changes to your branch to "catch up"
- git stash - Save uncommitted changes and revert to clean working directory
... and so much more
Image Source: Octodex