Git Basics
https://slides.com/alidejong/git-basics
Ali de Jong
Senior, ECE
Innovation Team
alioup
Florian Janke
Sophomore, CS
Innovation Team
jaflo
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4259529/8854330.jpg)
git != GitHub
- Version Control
- Commit History
- Managing changes
- Hosts code
- Open Source Community
- Collaboration and Sharing
![](https://image.flaticon.com/icons/png/512/25/25231.png)
![](https://upload.wikimedia.org/wikipedia/commons/thumb/6/66/Git-logo-black.svg/500px-Git-logo-black.svg.png)
Things You'll Need
- Github Account
- Text Editor
- Unix terminal / Git Bash
Github Account
- Make Account
- https://github.com
- Submit Username
- https://goo.gl/ap28FP
![](https://image.flaticon.com/icons/png/512/25/25231.png)
Text Editor
- Any one will work! (Examples: Atom, Sublime)
- Install Atom here
- https://atom.io/
![](https://discourse-cdn-sjc1.com/business/uploads/github_atom/490/d8548f4ce56f1599.png)
git Mac Install
$ brew install git
OR
http://git-scm.com/download/mac
$ git config --global user.name "username"
$ git config --global user.email "me@utexas.edu"
![](http://cdn.osxdaily.com/wp-content/uploads/2010/10/giant-apple-logo-bw.png)
git Windows Install
http://git-scm.com/download/win
![](http://pngimg.com/uploads/windows_logos/windows_logos_PNG25.png)
git Linux Install
$ sudo apt-get install git-all
$ git config --global user.name "username"
$ git config --global user.email "me@utexas.edu"
![](https://vignette.wikia.nocookie.net/logopedia/images/0/04/Linux_logo.png/revision/latest?cb=20120814052336)
Now we're ready!
Make a Repository
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4255051/Screen_Shot_2017-10-23_at_12.21.38_PM.png)
Clone the Repository
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4255064/Screen_Shot_2017-10-23_at_12.28.10_PM.png)
$ git clone https://github.com/alioup/workshop.git
Add Collaborators
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4255064/Screen_Shot_2017-10-23_at_12.28.10_PM.png)
Add Collaborators
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4255075/Screen_Shot_2017-10-23_at_12.31.23_PM.png)
Add Collaborators
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4255082/Screen_Shot_2017-10-23_at_12.32.18_PM.png)
Create a File
name: username.txt
content: Hello my name is Ali and my favorite emoji is 💃
Make a Commit
$ git status
$ git add username.txt
$ git status
$ git pull
$git push
Resolving a Merge Conflict
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4255455/Screen_Shot_2017-10-23_at_2.19.25_PM.png)
History
$ git log
OR
![](https://s3.amazonaws.com/media-p.slid.es/uploads/694767/images/4259438/Screen_Shot_2017-10-24_at_2.10.07_PM.png)
Reset to prior Commit
$ git reset COMMIT HASH --hard
Git Basics
By Ali de Jong
Git Basics
- 1,047