A beginner's talk on Git and GitHub. Three main sections: the basics, branching/merging, and collaborating (with GitHub). A funny xkcd comic is used (#1597). Brief mentions of GitHub alternatives (GitLab).

1. Git and GitHub
Rick Umali
@rickumali
June 21, 2016
Worcester PHP Meetup

2. Hello!
VIC-20, C-64, MTS
VVVVVV, LIMBO
C, Perl, Java, PHP, Ruby

3. Git versus GitHub
April 2005
Linus Torvalds, Junio Hammano
Open Source
February 2008
Tom Preston-Werner, Chris Wanstrath, PJ Hyett
Commercial

5. Motivating Example

6. Agenda
Basics
Branching/Merging
Collaborating with GitHub

7. Basics
Making a Repository
Adding Files to the Repository
Getting Status
Command Line versus GUI
“Everything is local”

8. git init
No Server Required!

9. git add

10. git commit
Staging Area (Index)

11. Getting Status
git status; git diff; git log

12. Git GUIs
gitk
git gui
Sourcetree
https://www.atlassian.com/software/sourcetree
Many others
https://git-scm.com/downloads/guis

13. Branching
and
Merging
Fast Branching
Visualizing
Mergetool
“Forks in the road”

16. Collaborating
Using
GitHub
Working with Remote Repositories
Cloning projects
Pull request
GitHub alternatives

17. Sharing A Repository

18. Clones/Pull Requests

19. GitHub Alternatives
GitLab
http://gitlab.com/
BitBucket
https://bitbucket.org/
Hosting Your Own
Community Edition of GitLab
GitHub for your enterprise

20. Thank You