Geek Answers Handbook

How to configure Beyond compare with Git command line

I am trying to figure out how to configure, without comparing, using the command line when using Git in windows (cygwin). Based on comparative documentation, they ask you to simply use the "path" to install bcomp.exe, and everything should work. But it does not automatically select the "Local", "Base" and "Remote" options. I am using Beyond Compare 3.0 PRO.

+4
source share
4 answers

I figured out the answer, having worked a bit with git configuration. Note. I edited the global git configuration in notepad, and this is how my configuration looks after I was done. Hope this helps someone.

[diff]
 tool = bc4
[difftool "bc4"]
 cmd =  "C:/program\\ files\\ \\(x86\\)/beyond\\ compare\\ 4/bcomp.exe $LOCAL $REMOTE"
[merge]
 tool = bc4
[mergetool "bc4"]
 cmd = "C:/Program\\ Files\\ \\(x86\\)/Beyond\\ Compare\\ 4/Bcomp.exe $LOCAL $REMOTE $BASE $MERGED"
 trustExitCode = true
 keepBackup = false
+10
source

Besides comparing version 3.

For Linux, in the terminal, enter the following commands:

git config --global diff.tool bc3
git config --global difftool.prompt false
git config --global difftool.bc3 trustExitCode true

git config --global merge.tool bc3
git config --global mergetool.bc3 trustExitCode true

For the next window type (you need to specify git the path to bcomp.exe)

git config --global difftool.bc3.path "c:/program files (x86)/beyond compare 3/BCompare.exe"
git config --global mergetool.bc3.path "c:/program files (x86)/beyond compare 3/bcomp.exe"
+1
source

Visual Studio , , . Beyond Compare 4 Pro Windows.

[diff]
    tool = bc
[difftool "bc"]
    cmd =  '"C:/Program Files/Beyond Compare 4/BComp.exe"' "$LOCAL" "$REMOTE"
[merge]
    tool = bc
[mergetool "bc"]
    cmd = '"C:/Program Files/Beyond Compare 4/BComp.exe"' "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
    trustExitCode = true
    keepBackup = false
+1

: . - .

$git config --global --edit

P.s. . win7 enterprise.

0

More articles:


All Articles