Git Fundamentals

Learn to understand and use Git

Description

Git is a distributed version control system that IT professionals use to save their source code and to share it.

This course teaches you how to use Git the right way. You will learn to work with a local and remote repository and to deal with merge conflicts. You will also learn the possibilities and risks of rewriting (local) history.

Learning Goals

• Solve merge conflicts using multiple strategies [Apply]
• Operate on a remote GIT repository in order to collaborate with others [Apply]
• Outline version control systems and GIT in historical context. [Remember]
• Extrapolate how the .git directory works under the hood. [Understand]
• Use git status and git diff to quickly identify changes [Apply]
• Understand how to rewrite history and what the consequences are [Understand]

Subjects

1. Introduction
   • What is source code control?
   • 1st, 2nd, 3rd generation
   • Git introduction
2. Anatomy of a Repository
   • Blobs
   • Trees
   • Commits
   • Hashes
3. Basic Snapshotting
   • Checkout/switch
   • Index
   • Branching
   • Add / commit
4. Going distributed
   • Introducing a remote
   • Fetch / pull and push
5. Branching & merging
   • Create branches
   • Merge kinds: fast forward, merge commit, rebasing
   • Tags
   • Solving conflicts
   • Commands: switch, restore, checkout, add, commit, tag
6. Status & diff
   • Untracked vs staged vs unmodified vs modified
   • .gitignore
   • Commands: status, diff, log (reflog, shortlog), reset, revert, stash, clean
7. Rewriting history
   • The dangers of rewriting history
   • Rebasing
   • Cherry-pick
   • Moving around
   • Commands: rebase, cherry-pick, prune, switch
8. Collaboration models
   • Learn the pros and cons of different collaboration models