1. 1. Git
2. 2. survey questions
3. 1. 2.1. How do you work now? Describe your current workflow!
   2. 2.2. How often do you commit? How often do you push/pull?
   3. 2.3. How often do you have 'conflicts'?
   4. 2.4. How do you make sure new code works fine?
   5. 2.5. How do you ensure you did not break anything?
   6. 2.6. What are the git commands in use?
   7. 2.7. Git commands
4. 3. Git intro
5. 1. 3.1. Communication
   2. 3.2. Why use a version control?
   3. 3.3. Version control Systems (VCS)
   4. 3.4. Local Version Control Systems (LVCS)
   5. 3.5. Centralized Version Control Systems (CVCS)
   6. 3.6. Distributed Version Control Systems (DVCS)
   7. 3.7. Why Git?
   8. 3.8. git services
   9. 3.9. Git Overview
   10. 3.10. Git Installation
   11. 3.11. Command line
   12. 3.12. Why Command line?
   13. 3.13. Which version do you have?
   14. 3.14. Configure Git
   15. 3.15. Configure Git - personalize
   16. 3.16. Configure and Privacy
   17. 3.17. More configuration - alias
   18. 3.18. Getting help
   19. 3.19. Exercises
6. 4. Git Basics
7. 1. 4.1. 4 Ways to get started
   2. 4.2. Creating a local empty repository
   3. 4.3. Create first file
   4. 4.4. File status
   5. 4.5. Add first file
   6. 4.6. Commit first file
   7. 4.7. Making some changes
   8. 4.8. Untracked and Modified
   9. 4.9. Untracked/Modified/Staged
   10. 4.10. Commit the file(s)
   11. 4.11. See the changes
   12. 4.12. Stage and HEAD
   13. 4.13. Remove from stage (unstage)
   14. 4.14. Drop local changes (restore to HEAD or to index)
   15. 4.15. Add all the files
   16. 4.16. Git ignore
   17. 4.17. .git/info/exclude
   18. 4.18. .gitkeep
   19. 4.19. add and commit in one step
   20. 4.20. Move a file
   21. 4.21. Remove a file
   22. 4.22. Frequency of commits
   23. 4.23. log
   24. 4.24. gitk
   25. 4.25. blame
   26. 4.26. Exercise
8. 5. Git Branching
9. 1. 5.1. Create a branch
   2. 5.2. Create a branch
   3. 5.3. Switch between branches
   4. 5.4. Exercises Session 4
   5. 5.5. Simple automatic merge
   6. 5.6. Merge with conflict
   7. 5.7. Repeated merge
   8. 5.8. Delete branch
   9. 5.9. Force delete branch
   10. 5.10. Delete remote branch
   11. 5.11. Exercises Session 6
   12. 5.12. rebase
   13. 5.13. Exercises Session 7
   14. 5.14. Various ways to list changes
   15. 5.15. log between commits
   16. 5.16. log show filenames
   17. 5.17. Show history of renamed file
   18. 5.18. Commits that were not merged yet
   19. 5.19. Git tag
   20. 5.20. Remove tags
   21. 5.21. Exercise
   22. 5.22. Exercises Session 3
10. 6. Git Local
11. 1. 6.1. Create server repository
    2. 6.2. Configure user
    3. 6.3. Add file
    4. 6.4. Update file
    5. 6.5. First 3 commits
    6. 6.6. Create branch
    7. 6.7. Switch to branch
    8. 6.8. Make changes on the branch
    9. 6.9. Switch to master
    10. 6.10. Add changes to master
    11. 6.11. Switch to branch
    12. 6.12. Another change on the branch
    13. 6.13. Merge branch to master
    14. 6.14. Shared feature branch
12. 7. Git Remote
13. 1. 7.1. Setup remote repository
    2. 7.2. Clone a repository
    3. 7.3. List remote repositories
    4. 7.4. push
    5. 7.5. fetch
    6. 7.6. pull
    7. 7.7. Simple Centralized workflow
    8. 7.8. incoming, outgoing
    9. 7.9. Remote branch
    10. 7.10. Remote branch created by others
    11. 7.11. Exercise
14. 8. Git Workspace
15. 1. 8.1. tags
    2. 8.2. Stash
    3. 8.3. Stash untracked files as well
    4. 8.4. Stash selected files
    5. 8.5. How to stash only part of the files
    6. 8.6. Clear stash
    7. 8.7. Exercises Session 8
    8. 8.8. Undo last commit
    9. 8.9. Undo git reset
    10. 8.10. git bisect - finding bugs
    11. 8.11. Exercises Session 9
    12. 8.12. git rebase
16. 9. Git Workflows
17. 1. 9.1. A collection of workflows and issues
    2. 9.2. Workflow for individuals
    3. 9.3. Git workflows
    4. 9.4. Centralized Workflow
    5. 9.5. Repo start
    6. 9.6. Developer A
    7. 9.7. Developer B
    8. 9.8. git pull (fetch+merge)
    9. 9.9. Forgetting to rebase
    10. 9.10. git pull --rebase (fetch+rebase)
    11. 9.11. Resolve conflicts
    12. 9.12. Conflicting patch
    13. 9.13. Conflicting file
    14. 9.14. Resolve conflicting file
    15. 9.15. Continue rebase
18. 10. Git Flow
19. 1. 10.1. About Git Flow
    2. 10.2. Git Flow branches
    3. 10.3. Git flow chart
    4. 10.4. Try Git Flow
    5. 10.5. Merge to develop
    6. 10.6. Delete remote branch
    7. 10.7. Gitflow with Fast Forward merges
20. 11. Github
21. 1. 11.1. Fork repository
    2. 11.2. Forking workflow
    3. 11.3. Clone a repository from Github
    4. 11.4. Github fork
    5. 11.5. git remote add
    6. 11.6. Public key
    7. 11.7. Exercise
    8. 11.8. Make some local changes
    9. 11.9. push out local changes to branch
    10. 11.10. Send Pull-Request
    11. 11.11. Make more changes and update the pull-request
    12. 11.12. Follow the changes in the original repository
    13. 11.13. Remove local branch
    14. 11.14. Remove remote branch
22. 12. Git Internals
23. 1. 12.1. Plumbing and Porcelan
    2. 12.2. The .git directory
    3. 12.3. Git Objects (Files)
    4. 12.4. See Objects
    5. 12.5. tags
24. 13. Appendix
25. 1. 13.1. Setup remote repository
    2. 13.2. Revert local changes
    3. 13.3. Undelete a file
    4. 13.4. Edit config files
    5. 13.5. Common Git commands
    6. 13.6. Tools
    7. 13.7. External difftool WinMerge
    8. 13.8. Resources
26. 14. Extra
27. 1. 14.1. Stage hunk-by-hunk
    2. 14.2. Edit last commit message
    3. 14.3. Push to remote branch
    4. 14.4. Detached HEAD
    5. 14.5. Change last commit message
    6. 14.6. How to see the content of the staged version of a file?
    7. 14.7. How to see an older version of a file?
    8. 14.8. Setup git subtree
    9. 14.9. git subtree change parent
    10. 14.10. git subtree change in subtre