- Git is a distributed revision control system that keeps track of changes made to files over time through log messages and allows developers to easily share changes. - Git has a basic workflow of modifying files, staging files, and committing files to the local repository. - GitHub is a hosting service for Git repositories that allows collaboration on projects by multiple developers through pushing and pulling changes from a shared remote repository.

1. Git and GitHub.com

2. Git 101 Git is a distributed revision control system Keeps track of changes made to one or more files over time Shows log messages of what changed and why Allows developers to share their changes easily

3. Git Project Sections Source: http://progit.org/book/ch1-3.html

4. Git workflow Modify Files Stage Files Commit Files

5. Installing Git Covered in detail at http://progit.org/book/ch1-4.html

6. Initial Setup git config --global user.name “John Doe” git config --global user.email [email_address] git config --global core.editor emacs By default, it uses GIT_EDITOR, VISUAL or EDITOR Environment variables Other editors are vi, mate -m, nano, etc git config --list Shows your git settings See http://progit.org/book/ch1-5.html for more

7. Getting help Most Git commands have help available git help commit git help branch git help tag

8. Getting started with Git mkdir project_name cd project_name git init echo “Hello” >> README git add README git commit -m ‘Initial commit’

9. Getting started Lab Create a new directory Initialize git Create/Edit a file Add/Stage that file Commit the stage to your local repo Repeat

10. Working with remote repos Public Repo Located on Server (Github) Private Repo Located on your local machine git pull git push

11. Signup with Github https://github.com/signup/free You can skip SSH Public Key, we’ll come back to it

12. Setup SSH Keys ssh-keygen -d

13. Setup local SSH config If you don’t use your “default” ssh key for GitHub, you need to tell SSH to use your Github key

14. Add SSH Key to GitHub https://github.com/account

15. Create my_project repo (on Github.com) https://github.com/

16. Add remote repo to your local repo cd my_project git remote add origin git@github.com:your-user-name/my_project.git git push origin master “ origin” is configurable name “ origin” is convention for GitHub View changes at http://github.com/your-user-name/my_project

17. Remote repos process Public Repo Located on Server (Github) Private Repo Located on your local machine git push Make file changes Stage Changes Commit Changes git add filename git commit -m ‘…’ vi filename

18. Commit changes and push to remote repo cd my_project echo “bye” >> README git add README git commit -m ‘Added bye to README’ git push origin master OR git push View changes at http://github.com/your-user-name/my_project

19. Lab with remote repos (on Github.com) Modify file locally Add/Stage that file to the commit Commit your changes Push those changes to GitHub

20. Remote repos process (multiple committers) Public Repo Located on Server (Github) Private Repo Located on your local machine 1) git push Make file changes Stage Changes Commit Changes git add filename git commit -m ‘…’ vi filename Bob’s Private Repo Located on Bob’s local machine 2) git pull

21. Remote repos process (multiple committers) Public Repo Located on Server (Github) Private Repo Located on your local machine 2) git pull Bob’s Private Repo Located on Bob’s local machine Make file changes Stage Changes Commit Changes git add filename git commit -m ‘…’ vi filename 1) git push

22. Pull commits from remote repo cd my_project git pull origin master OR git pull

23. Lab with remote repos (on Github.com) User A Modify file locally Add/Stage that file to the commit Commit your changes Push those changes to GitHub User B Pull those changes from GitHub