IntelliJ Idea git的设置（VS-Visual Studio 设置同理） - merge， rebase，Branch Default

最新推荐文章于 2025-04-02 15:53:32 发布

kingmax54212008

最新推荐文章于 2025-04-02 15:53:32 发布

阅读量8.8k

点赞数 1

分类专栏： java Git 文章标签： git branch merge rebase

本文链接：https://blog.csdn.net/kingmax54212008/article/details/85703594

版权

java 同时被 2 个专栏收录

85 篇文章

订阅专栏

Git

3 篇文章

订阅专栏

本文深入探讨了Git中合并(merge)与变基(rebase)两种操作的区别及应用场景。通过具体的例子，展示了当从一个分支合并到另一个分支时，merge会保留历史记录，而rebase则会将提交重新应用到目标分支上，从而保持线性历史。文章还介绍了如何在.git/config文件中设置默认的合并或变基命令。

摘要生成于 C知道，由 DeepSeek-R1 满血版支持，前往体验 >

Merge: The result is identical with that of running git fetch ; git merge or git pull.
Rebase: The result is identical with that of running git fetch ; git rebase or git pull --rebase.
Branch Default: This option is to choose the default command for the branch applied. The default command is specified in the branch.<name> section of the .git/config configuration file.

Example: Assume the following history exists

  A---B---C topic
 /
D---E---F---G master

Merge:
If the current branch is "master"
Then "git merge topic" will replay the changes made on the topic branch since it diverged from master.Then the result of the following command:
git merge topic would be:

  A---B---C topic
 /         \
D---E---F---G---H master

Rebase:
If the current branch is "topic"
Then the commits that were in the "topic" branch are reapplied to the current branch, one by one, in order. Then the result of either of the following commands:
git rebase master or
git rebase master topic would be:

              A'--B'--C' topic
             /
D---E---F---G master

For further reference please refer the links below:
1.https://git-scm.com/docs/git-merge
2.https://git-scm.com/docs/git-rebase
3.https://www.jetbrains.com/idea/help/update-project-dialog-git.html?search=update%20projec