Git Tutorial: Rebase, Interactive Rebase, Squash & Cherry-Pick Deep Dive
Git Masterclass: How Git Works in Production (Part 3)
👉 GitHub Repository: https://github.com/CloudWithVarJosh/G...
👉 Git Playlist: • Git Masterclass
👉 Join the Channel to support: / @cloudwithvarjosh
In Part 2, we moved into collaboration and understood how Git works in production with teams, pull requests, and controlled workflows.
In this lecture, we go one level deeper into advanced Git operations that are commonly used to manage and refine changes before they are merged into production.
You will learn how to rewrite commit history, clean up commits, and move changes across branches in a controlled way.
This is where Git becomes not just a tool for tracking changes, but a system to *maintain clean, readable, and production-ready history*.
By the end of this session, you will not just use Git commands, you will understand *when and why to use them in real-world scenarios*.
🛠 What You’ll Learn
What Git Rebase is and how it creates a linear history
Difference between Git Merge and Git Rebase (when to use what)
How to use `git rebase` in real workflows
What Interactive Rebase is and how to modify commit history
How to squash, reword, and clean up commits before merging
What Squash Merge is and how it is used in GitHub workflows
When to use Squash vs Rebase vs Merge
What Cherry-Pick is and how to move specific commits across branches
Real-world use cases of cherry-pick in production
How conflicts occur during rebase and cherry-pick, and how to resolve them
Best practices for maintaining clean commit history in teams
⏰ Timestamps
00:00:00 Introduction
00:01:35 Git Rebase
00:22:52 Demo: Git Rebase
00:45:11 Interactive Rebase: Concept
00:51:57 Demo: Interactive Rebase
01:01:39 Squash Merge (Squash & Merge)
01:13:44 Demo: Squash & Merge (GitHub)
01:29:47 Cherry-Pick
01:33:41 Demo: Cherry-Pick
01:41:19 Outro
📚 Other Courses
Kubernetes
👉 CKA 2025 Playlist: • CKA Certification Course 2025
👉 Kubernetes Projects: • DevOps Projects
👉 Kubernetes Mega Project: • DevSecOps Mega Project | Multi-AZ Amazon E...
CI/CD (Jenkins)
👉 Jenkins Playlist: • Jenkins: Basics To Production
👉 GitHub Repository: https://github.com/CloudWithVarJosh/J...
*GitOps (ArgoCD)
👉 Argo CD Playlist: • Argo CD: Basics to Production Course
👉 Argo CD Repository: https://github.com/CloudWithVarJosh/A...
🔗 Stay Connected
👉 LinkedIn: / varun-joshi-2b516752
👉 GitHub: https://github.com/CloudWithVarJosh
🔖 Hashtags
#Git #DevOps #CloudWithVarJosh #GitMasterclass #GitTutorial #GitRebase #CherryPick #SquashMerge #VersionControl #SoftwareEngineering