Скачать или смотреть How to Rebase Multiple Commits from a Branch onto Master in Git

A step-by-step guide on how to rebase multiple commits from a branch to the master branch in Git, maintaining code integrity with ease.
---
This video is based on the question https://stackoverflow.com/q/63917813/ asked by the user 'Youshikyou' ( https://stackoverflow.com/u/9261745/ ) and on the answer https://stackoverflow.com/a/63917942/ provided by the user 'Tim Biegeleisen' ( https://stackoverflow.com/u/1863229/ ) 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 multiple commits in one branch to the master

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.
---
Git Rebase: Moving Multiple Commits from a Branch to Master

Git is a powerful version control system that allows developers to manage their code effectively. However, it can sometimes be confusing, especially when it comes to operations like rebasing commits from one branch to another. In this guide, we will explore how to rebase multiple commits from a branch called next to the master branch, with clear steps to guide you through the process.

Understanding the Problem

Let’s start with a visual of our commit history:

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

In the example above:

The master branch contains five commits (o1 to o5).

The next branch has three additional commits (x1 to x3) that we want to move onto master.

After the rebase, we would like our history to look like this below, preserving both branches:

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

Sounds simple enough, right? Let’s break down how to achieve this in two clear steps.

Step 1: Rebase with --onto

First, we need to bring the top three commits from the next branch (x1, x2, x3) onto the master branch, directly following the last commit in master (o5). To do this, we use the git rebase --onto command.

Command to Use:

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

Explanation:

o5: This is the last commit on the master branch where you want to move the new commits.

o7: This is the commit just before your first commit to be rebased (x1).

After running this command, your tree will look like this:

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

Step 2: Remove the Rebasing Commits from next

Once we have rebased the commits onto master, the final step is to remove the now redundant commits from the next branch. We can reset the next branch’s HEAD by three commits back, effectively removing x1, x2, and x3.

Command to Use:

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

Explanation:

HEAD~3 means you want to move back three commits from the current position in the next branch.

After this command, your commit history will look like this:

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

Conclusion

By following these two straightforward steps, you can efficiently rebase multiple commits from a branch to the master in Git. With clarity on how the commands work, you'll maintain your code structure and stay organized throughout your development process. Happy coding!