1. 1. Git
2. 2. Survey questions
   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
3. 3. VCS
   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. Locking or not
4. 4. Git intro
   1. 4.1. Git Overview
   2. 4.2. Git Installation
   3. 4.3. Command line
   4. 4.4. Why Command line?
   5. 4.5. GUI
   6. 4.6. Which version do you have?
   7. 4.7. Configure Git
   8. 4.8. Configure Git - personalize
   9. 4.9. Configure and Privacy
   10. 4.10. More configuration - alias
   11. 4.11. Getting help
   12. 4.12. Git Tutorial
   13. 4.13. Exercises
5. 5. Git Basics
   1. 5.1. 4 Ways to get started
   2. 5.2. Creating a local empty repository
   3. 5.3. Create first file
   4. 5.4. Add first file
   5. 5.5. Commit first file
   6. 5.6. File status
   7. 5.7. Making some changes
   8. 5.8. Untracked and Modified
   9. 5.9. Untracked/Modified/Staged
   10. 5.10. Commit the file(s)
   11. 5.11. See the changes
   12. 5.12. Stage and HEAD
   13. 5.13. Remove from stage (unstage)
   14. 5.14. Drop local changes (restore to HEAD or to index)
   15. 5.15. Add all the files
   16. 5.16. Git ignore
   17. 5.17. .git/info/exclude
   18. 5.18. .gitkeep
   19. 5.19. add and commit in one step
   20. 5.20. Move a file
   21. 5.21. Remove a file
   22. 5.22. Frequency of commits
   23. 5.23. git log
   24. 5.24. gitk
   25. 5.25. blame
   26. 5.26. short status
   27. 5.27. Exercise 2
6. 6. Git branching, merging, and rebase
   1. 6.1. Why use branches?
   2. 6.2. Create a branch
   3. 6.3. Create a branch and switch to it
   4. 6.4. Switch between branches
   5. 6.5. Exercises Session 4
   6. 6.6. Simple automatic merge
   7. 6.7. Merge with conflict
   8. 6.8. Merge conflict in Python
   9. 6.9. Merge conflict in Rust
   10. 6.10. Repeated merge
   11. 6.11. Delete branch
   12. 6.12. Force delete branch
   13. 6.13. Exercise 5
   14. 6.14. Exercises Session 6
   15. 6.15. rebase
   16. 6.16. Exercises Session 7
   17. 6.17. Various ways to list changes
   18. 6.18. log between commits
   19. 6.19. log show filenames
   20. 6.20. Show history of renamed file
   21. 6.21. Commits that were not merged yet
   22. 6.22. Git tag
   23. 6.23. Remove tags
   24. 6.24. Exercise
   25. 6.25. Exercises Session 3
7. 7. Git Local
   1. 7.1. Create server repository
   2. 7.2. Configure user
   3. 7.3. Add file
   4. 7.4. Update file
   5. 7.5. First 3 commits
   6. 7.6. Create branch
   7. 7.7. Switch to branch
   8. 7.8. Make changes on the branch
   9. 7.9. Switch to main
   10. 7.10. Add changes to main
   11. 7.11. Switch to branch
   12. 7.12. Another change on the branch
   13. 7.13. Merge branch to main
   14. 7.14. Shared feature branch
8. 8. Git Remote
   1. 8.1. Network protocols
   2. 8.2. Setup remote repository
   3. 8.3. Clone a repository
   4. 8.4. List remote repositories
   5. 8.5. push
   6. 8.6. fetch
   7. 8.7. pull
   8. 8.8. incoming, outgoing
   9. 8.9. Remote branch
   10. 8.10. Remote branch created by others
   11. 8.11. Delete remote branch
   12. 8.12. Remove remote tags
   13. 8.13. Exercise
9. 9. Git Workspace
   1. 9.1. tags
   2. 9.2. Stash
   3. 9.3. Stash untracked files as well
   4. 9.4. Stash selected files
   5. 9.5. How to stash only part of the files
   6. 9.6. Clear stash
   7. 9.7. Exercises Session 8
   8. 9.8. Undo last commit
   9. 9.9. Undo git reset
   10. 9.10. git bisect - finding bugs
   11. 9.11. Exercises Session 9
   12. 9.12. git rebase
10. 10. Git Workflows
    1. 10.1. A collection of workflows and issues
    2. 10.2. Workflow for individuals
    3. 10.3. Git workflows
    4. 10.4. Simple Centralized workflow
    5. 10.5. Centralized Workflow
    6. 10.6. Repo start
    7. 10.7. Developer A
    8. 10.8. Developer B
    9. 10.9. git pull (fetch+merge)
    10. 10.10. Forgetting to rebase
    11. 10.11. git pull --rebase (fetch+rebase)
    12. 10.12. Resolve conflicts
    13. 10.13. Conflicting patch
    14. 10.14. Conflicting file
    15. 10.15. Resolve conflicting file
    16. 10.16. Continue rebase
11. 11. Git Flow
    1. 11.1. About Git Flow
    2. 11.2. Git Flow branches
    3. 11.3. Git flow chart
    4. 11.4. Try Git Flow
    5. 11.5. Merge to develop
    6. 11.6. Delete remote branch
    7. 11.7. Gitflow with Fast Forward merges
12. 12. Github
    1. 12.1. Github Open Source
    2. 12.2. Fork repository
    3. 12.3. Forking workflow
    4. 12.4. Clone a repository from Github
    5. 12.5. Github fork
    6. 12.6. git remote add
    7. 12.7. Public key
    8. 12.8. Exercise
    9. 12.9. Make some local changes
    10. 12.10. push out local changes to branch
    11. 12.11. Send Pull-Request
    12. 12.12. Make more changes and update the pull-request
    13. 12.13. Follow the changes in the original repository
    14. 12.14. Remove local branch
    15. 12.15. Remove remote branch
13. 13. Git Internals
    1. 13.1. Plumbing and Porcelain
    2. 13.2. The .git directory
    3. 13.3. Git Objects (Files)
    4. 13.4. See Objects
    5. 13.5. tags
14. 14. Appendix
    1. 14.1. Setup remote repository
    2. 14.2. Revert local changes
    3. 14.3. Undelete a file
    4. 14.4. Edit config files
    5. 14.5. Common Git commands
    6. 14.6. Tools
    7. 14.7. External difftools
    8. 14.8. External difftool WinMerge
    9. 14.9. Resources
    10. 14.10. Conflicts
15. 15. Hooks
    1. 15.1. pre-commit hook
    2. 15.2. commit-msg hook
16. 16. Other tools
    1. 16.1. tig
    2. 16.2. cgit
    3. 16.3. gitore
17. 17. Extra
    1. 17.1. Stage hunk-by-hunk
    2. 17.2. Push to remote branch
    3. 17.3. Detached HEAD
    4. 17.4. Change last commit message
    5. 17.5. Remove file added accidentally in last commit
    6. 17.6. How to see the content of the staged version of a file?
    7. 17.7. How to see an older version of a file?
    8. 17.8. Setup git subtree
    9. 17.9. git subtree change parent
    10. 17.10. git subtree change in subtree
    11. 17.11. Set the author
    12. 17.12. Find removed code
    13. 17.13. Move main branch to an earlier commit
    14. 17.14. Rename branch
    15. 17.15. Local config file
    16. 17.16. LFS - Git Large File Storage
    17. 17.17. Show the diff in the commit-message-editor