如何使超越比较工作在Eclipse与Git? [英] How to make Beyond Compare work within Eclipse with Git?
问题描述
清楚的说明如何使BC成为在Eclipse中使用而不是时Subversion和Git进行差异和合并的默认工具。但后者呢?我继续收到以下对话框:
There is clear explanation how to make BC a default tool for diff and merging for Subversion and Git when used not from within Eclipse. But what about the latter? I keep getting the following dialog:
更新:
添加到我的全局.gitconfig和 git difftool
命令现在可以工作。关于Eclipse不能说相同。我不知道为什么这么混乱设置。
UPDATE:
Added to my global .gitconfig and git difftool
command now works. Can't say the same about Eclipse. I can't get why it's so confusing to set up.
[diff]
tool = bc3
[difftool]
prompt = false
[difftool "bc3"]
cmd = \"C:/Program Files (x86)/Beyond Compare 3/BComp.exe\" "$LOCAL" "$REMOTE"
我的Eclipse配置现在看起来像:
My Eclipse config now looks like:
推荐答案
p> 此主题建议:
- 修改git config
- tinkering the the git config
Eclipse首选项,位于
Team - > Git - >配置
,它指向一个.gitconfig
文件。 (和声明超越比较文档)
Eclipse Preferences, under
Team -> Git -> Configuration
, it points to a.gitconfig
file. (and declare beyond compare as documented)
Beyond Compare和Eclipse本身的集成是基于一个插件,所以BC和EGit之间的直接集成可能不可能通过Eclipse直接进行。
The integration of Beyond Compare and Eclipse itself is based on a plugin, so a direct integration between BC and EGit might not be possible directly through Eclipse.
这篇关于如何使超越比较工作在Eclipse与Git?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持IT屋!