How to use git rebase

git rebase is used to reapply commits to a new baseline to clean up history or relocate branches. How to use: Create a target branch Select the commit to be reapplied and execute the git rebase command, specify the target branch and commit scope to resolve conflicts, continue to reapply the remaining commit verification changes.

How to use git rebase

What is git rebase?

git rebase is a Git command that reapplies the specified commit to a new benchmark. In other words, it moves the commit from the current branch to another branch or commit.

Why use git rebase?

• Clean up commit history: rebase can be used to clean up commit history, merge small commits, or eliminate unnecessary merge commits.
• Relocate branches: rebase can be used to move branches to new baselines, such as merging remote branches or resolving conflicts.

How to use git rebase

1. Prepare a target branch
Before starting rebase, create a target branch that will become the new benchmark for commits.

 <code>git checkout -b new-base # 创建new-base 分支</code>

2. Select Submit
Use the <code>git log</code> command to determine the submission to reapply.

 <code>git log</code>

3. Execute rebase
Use the git rebase command, followed by the name of the target branch and the commit range to be reapplied.

 <code>git rebase new-base HEAD~3 # 重新应用HEAD 之前的3 个提交</code>

4. Resolve conflicts
In the rebase process, conflicts may be encountered and need to be resolved manually. Open conflict files in the editor and modify them to resolve the conflict.

 <code># 保存更改并退出编辑器git add . # 提交解决的冲突git commit --amend</code>

5. Complete rebase
After all conflicts are resolved, use the <code>git rebase --continue</code> command to continue reapplying the remaining commits.

 <code>git rebase --continue</code>

6. Check the changes
Use the <code>git log</code> command to verify that rebase is successful.

 <code>git log</code>

The above is the detailed content of How to use git rebase. For more information, please follow other related articles on the PHP Chinese website!