Advanced Git (Part 2): Master Rebase, Squash & Cherry-Pick

Name: Advanced Git (Part 2): Master Rebase, Squash & Cherry-Pick
Rating: 4.6 (28 reviews)

Clean up your commit history, resolve complex workflows, and master Git Rebase, Squash, Fixup, and Tags.

Created byAbdul Rahman Al Hourani

Last updated 6/2026

English

English [Auto],

What you'll learn

Apply specific changes from one commit to another using cherry-pick.
Clean up and restructure commit history for better organization using Rebase, squash and commit fixup.
Update commit messages and delete branches.
Tag commits and understand the meaning of the tag.
Get familiar with Markdown for project documentation.

Course content

1 section • 11 lectures • 1h 19m total length

Cherry pick3:21
Master the cherry pick technique by extracting a single commit from another branch into your current branch, using git log, the commit hash, and pushing.
Rebase13:59
Learn how to rebase to incorporate the latest changes from the base branch, resolve conflicts, and adjust commit history with interactive rebase, git fetch origin, and force push practices.
why rebase before merge12:12
Rebase before merge keeps history clean by rebasing your branch onto the latest main, then performing a fast-forward merge and resolving conflicts on your branch.
Squash11:12
Drop3:32
Learn to drop a commit from history using git rebase on a new branch, then drop the second commit by using d and force push to update history.
Commit Fixup8:23
Learn to organize git history by splitting changes into small, related commits, using fixup to merge with older commits, and rebasing with autosquash to create a clean, cohesive history.
Amend2:44
Learn how to amend the last commit message using git commit --amend, edit in vim, and force push if the change rewrites history.
Delete branch3:24
Practice deleting a branch from both local and origin by creating a new branch, pushing it online, then removing it locally and remotely.
Tags8:35
Markdown Syntax9:35
Explore markdown basics for creating readme files, including headings, blockquotes, and tables, and learn how readme displays online after pushing with git add, commit, and push.
Conclusion2:48
Master essential git workflows from install to rebase and squash, covering clone, commit, push, ignore, merge strategies, stash, reset, cherry-pick, and tagging for organized collaboration.

Requirements

Basic knowledge of Git (commits, basic branching, and merging) or completion of Git (Part 1) is required.

Description

Stop guessing how Git commands affect your history. See them in action.

Git concepts like Rebasing, Squashing, and Cherry-picking are notoriously difficult to visualize, and a single wrong command can feel terrifying. This course completely breaks away from dry terminal text. By utilizing animated illustrations, you will see exactly how commits are ordered, moved, and transformed over time.

This isn't just a collection of basic commands—it is a carefully crafted curriculum designed to bridge the gap between basic Git usage and professional, enterprise-grade history management. You will build both the technical precision and the engineering mindset required to thrive in collaborative development teams at large organizations.

What We Cover in Detail:

Advanced History Rewriting: Master Rebase, Squash, Drop, and Amend to keep your branch history pristine.
Precision Target Tracking: Learn how to use Cherry-pick to pull specific changes across branches without unwanted baggage.
Workflow Automation: Understand Commit-fixup to seamlessly patch changes into older commits.
Release Management: Learn how to properly use Tags to mark milestones and production releases.
Documentation: Get familiar with Markdown Language syntax to build clean, professional project documentation.

By the End of This Course, You Will Be Able To:

Clean and Restructure History: Confidently rewrite, clean up, and organize chaotic commit histories before they hit code review.
Collaborate at Scale: Work smoothly inside large engineering teams with a deep understanding of why to rebase before a merge.
Manage Commits with Precision: Command full control over how your team's code history develops, avoiding accidental data loss or messy merge commits.
Write Clean Documentation: Ensure your repositories are professional from the code history down to the README file.

Who this course is for:

For beginners taking their first steps into programming.
Anyone who wants to collaborate with a team on the same project.
Anyone who wants to learn how to manage their project’s versions and change history.