Скачать или смотреть Mastering git rebase and Resets

Learn how to effectively use `git rebase` and reset commits in your source branch. This guide explains how to combine commits and manage your Git history efficiently.
---
This video is based on the question https://stackoverflow.com/q/69231545/ asked by the user 'RedFox' ( https://stackoverflow.com/u/496553/ ) and on the answer https://stackoverflow.com/a/75860152/ provided by the user 'knittl' ( https://stackoverflow.com/u/112968/ ) at 'Stack Overflow' website. Thanks to these great users and Stackexchange community for their contributions.

Visit these links for original content and any more details, such as alternate solutions, latest updates/developments on topic, comments, revision history etc. For example, the original title of the Question was: git rebase and reset commits to source branch

Also, Content (except music) licensed under CC BY-SA https://meta.stackexchange.com/help/l...
The original Question post is licensed under the 'CC BY-SA 4.0' ( https://creativecommons.org/licenses/... ) license, and the original Answer post is licensed under the 'CC BY-SA 4.0' ( https://creativecommons.org/licenses/... ) license.

If anything seems off to you, please feel free to write me at vlogize [AT] gmail [DOT] com.
---
Mastering git rebase and Resets: A Complete Guide

Are you feeling stuck trying to manage your Git branches and commit history? In this guide, we will tackle a common Git scenario: rebasing a branch and restructuring your commit history. We’ll guide you step-by-step on how to rebase your branch onto another while organizing your commits into a streamlined format.

Understanding the Problem

Let's say you have two branches, staging-branch and my-branch, as illustrated below:

[[See Video to Reveal this Text or Code Snippet]]

In this setup, you want to rebase my-branch onto staging-branch and end up with a consolidated commit history that accurately reflects both sets of changes, as shown below:

[[See Video to Reveal this Text or Code Snippet]]

Ultimately, your goal is to combine all commits into just two (for clarity and simplicity), resulting in:

[[See Video to Reveal this Text or Code Snippet]]

The Solution: Using Git Rebase and Interactive Options

To achieve this result, you will leverage Git’s interactive rebase feature. Here's a step-by-step breakdown of how to do that effectively.

Step 1: Initiate Interactive Rebase

First, you need to start the interactive rebase. Run the following command in your terminal:

[[See Video to Reveal this Text or Code Snippet]]

This command opens a text editor displaying all commits in my-branch that you can manipulate.

Step 2: Edit the Todo List

By default, the editor shows a list of your commits with an action set to pick, which looks like this:

[[See Video to Reveal this Text or Code Snippet]]

Combining Commits

To restructure your commits, replace pick with either fixup (or f, to combine commits without changing the commit message) or squash (or s, to combine and allow message editing). For example:

[[See Video to Reveal this Text or Code Snippet]]

This configuration will:

Combine commits A5, A4, and A3 into one

Combine commits A2 and A1 into another

Step 3: Save and Exit

After making your edits, save the file and exit the editor. Git will process your request and perform the rebase.

If you encounter conflicts during the rebase, you'll need to resolve each conflict manually. After resolving the issues, continue the rebase process by running:

[[See Video to Reveal this Text or Code Snippet]]

Final Outcome

When all steps are successfully completed without conflicts, your branch history will resemble this structure:

[[See Video to Reveal this Text or Code Snippet]]

Wrapping Up

And there you have it! You've successfully rebased your branch onto another and combined your commits into a more manageable format. Mastering git rebase can take some practice, but once you grasp this concept, it will greatly enhance your ability to manage project histories effectively. Keep experimenting, and happy coding!