"git diff --base"到底是什么?做? [英] What exactly does "git diff --base" do?

问题描述

我的笔记说git diff --base的功能是查看与基本文件的冲突(两个分支开始转移所考虑的文件的位置)"，但我无法在没有任何示例的情况下将其可视化.这与普通的git diff命令有何不同?

My notes say the function of git diff --base is to "View the conflicts against the base file (the point where the two branches started diverting the considered file)" but I am not being able to visualize this without any example. How does this differ from the normal git diff command?

推荐答案

使用git diff --base仅对处于冲突状态的文件有意义，例如，在合并，cherry-pick或rebase过程中.

Using git diff --base makes sense only for files that are in a conflicted state, for example, during a merge, or a cherry-pick, or a rebase.

当文件foo中存在冲突时，索引中记录了三个版本:基本"版本，其"版本和我们的"版本.正如您在笔记中所写，基本"版本确实是两个分支开始分开的文件版本.

When there is a conflict in file foo, there are three versions recorded in the index: the "base" version, "their" version, and "our" version. The "base" version is indeed the version of the file where the two branches started diverging, as you have written in your notes.

因此，当您键入

git diff --base foo

您会看到工作树中当前foo版本与基本版本的区别.

you see the difference of the current version of foo in the worktree to the base version.

类似地，您可以使用

git diff --theirs foo
git diff --ours foo

查看与冲突所涉及的其他两个版本的区别.

to see the difference to the other two versions involved in the conflict.

这篇关于"git diff --base"到底是什么?做?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！