🪣 Git Concepts Explained Visually

• 🏗️ Git's power comes with complexity that can be intimidating.
• ⁉️ Many Git concepts are counter-intuitive or confusingly named:
  • Cherry-pick? Detached HEAD??
• 🔎 We explore some elements of git from different perspectives to create a more solid picture.
• 🥸 The objective is to understand git better, not to know all the internals.
• 🧰 We barely discuss terminal commands. We focus on what can be done and why.
• 🍼 Streamlined for internet-age kids with no attention span!

⚠️ Usage

• 🛠 Previous experience with Git and programming is expected.
• 🌲 This emoji indicates SourceTree-specific info.

🧱 Content

🪣 Git Repository as a Graph

• 📸 Commits: Nodes in a graph
• 👉 Branches: Simple pointers to commits
• 🧭 HEAD: The reference to the current commit
• 📋 Index: The draft of the next commit

📁 Git Repository Folder

• 📋 Staging: Preparing the next commit
• ✅ Committing: Creating new nodes in the commit graph

🏋️ Working Directory

• 📂 Project Dir: File structure
• 🚫 File States: Staged/Unstaged, tracked/untracked, ignored

🔀 Checkout/Switching

• 🔀 Moving Around: Switch to/Checkout commits/branches
• 📦 Stashing: Temporarily storing uncommitted changes
• 🌳 Worktrees: Work on multiple branches in separate folders

🔍 Diffs

• 🧩 Hunks: Segments of changes
• 🔍 Diffs: Comparing versions
• 🔃 Conflict Markers: The way Git shows several versions in a file
• 📏 Commit Distance: Common measure to compare branches

🔄 Merging

• 🔄 Merging: Combining work from different branches
• ⚔️ Resolving Conflicts: Strategies and best practices

✏️ Rebasing

• 🍒 Cherry-picking: Applying specific commits to different branches
• ✏️ Rebasing: Move an entire branch to a different base commit
• 🔧 Interactive Rebasing: Squashing, editing, and reordering commits

🚑 Recovery Techniques

• 🕸️ Reflog: A safety net for recovering lost commits
• ⏪ Reset/Revert/Restore: Different ways to undo changes

🌐 Remotes

• 🌐 Remotes: The repositories you want to sync with
• 🔗 Tracking: How local and remote branches relate
• 🔄 Syncing: Syncing with other repositories
• 👥 Merge/Pull Requests: Online collaboration feature

⚙️ Configuration

• 🛠️ Git Config: User identity, line endings, default branch, rerere...
• 🪝 Git Hooks: Automating tasks with pre-commit and post-commit hooks

🪟 Interfaces

• 📺 git: Git's main interface (the git CLI)
• 🚀 lazygit: Fully-featured and intuitive TUI
• 🌲 SourceTree: Popular free cross-platform GUI