This document provides an introduction to using Git and GitHub for version control of documents and collaboration. It explains the basic workflow of creating, editing, and saving files individually. It then introduces Git as a tool to track changes to documents over time, including who made each change and when. The document outlines setting up Git locally and using basic commands like commit, diff, log, branch, merge, and push/pull to the remote GitHub repository. It highlights key GitHub features like the profile page, repository page, pull requests, and hosting websites for free using GitHub Pages.

1. @ssaunier
git & GitHub
for Beginners

2. Knowledge worker
We create and edit documents (text, images, etc.)

3. Everyday workflow
1. Create a file
2. Save it
3. Edit it
4. Save it again
5. etc.

4. File life

5. Manual version control

6. Can we automate this?
For each document version, we need to know
1. When the file was modified
2. What changed
3. Why it was modified

7. There’s more, teams

8. Hence one more question
For each document version, we need to know
1. When the file was modified
2. What changed
3. Why it was modified
4. Who did the change

9. In a nutshell
We want a tool which
1. tracks document version
2. keeps an history of document changes
3. foster team work

11. Set up
Download & install git at http://git-scm.com/

12. Your identity
$ git config --global user.name "Sebastien Saunier”
$ git config --global user.email "seb@lewagon.org"

13. Basic commands

14. Starting
$ mkdir new_project
$ cd new_project
$ git init

15. Status
$ git status
git can tell you if your folder has some modified files (dirty)

16. Commit

17. 2-steps process
# Select which file to add to the commit.
$ git add <file_1_which_has_been_modified>
$ git add <file_2_which_has_been_modified>
# Take a snapshot of what is in the staging area.
$ git commit --message "A meaningful message about this change"

18. Diff
If git status tells you something changed,
you can inspect exactly what changed:
$ git diff
$ git diff <a_specific_file_or_folder>

19. Log
Show commit history with
$ git log

20. Branching

21. One feature = One branch

22. Branch
$ git branch my-feature

23. Working in the Branch
$ git checkout my-feature
$ git commit (x2)

24. Merge
$ git checkout master
$ git diff master..my-feature
$ git merge --no-ff my-feature

25. Clean up
$ git branch -d my-feature

26. Start Over

27. Remote

30. We need a remote!
Go to GitHub, create a repo: https://github.com/new
$ git remote add origin https://github.com/<user>/<project>.git

31. Push
Share the code with your team, and the world
# Generic command
$ git push <remote> <branch>
# What we'll use
$ git push origin master

32. Pull
# Generic command
$ git pull <remote> <branch>
# What we'll use
$ git pull origin master

33. Github Desktop app
desktop.github.com

35. Profile page

36. Repository page

37. Commits & Branches

38. Pull requests

39. Issues

40. Forks
Open source contribution

41. Github pages
Hosting your website for free!
Repo example: lewagon/ui-components

42. Thank you!