git difftool和mergetool圖形化

1.當然是先安裝Beyond Compare3 (此處省略安裝步驟，自行百度)

 

2.設置difftool

git config --global diff.tool bc3

git config --global difftool.bc3.path "/usr/bin/bcompare

git config --global difftool.prompt false

 

3.設置mergetool

git config --global merge.tool bc3

git config --global mergetool.bc3.path "/usr/bin/bcompare"

git config --global mergetool.bc3.trustExitCode true

____________________________________________________________________________________________

Windows git difftool和mergetool圖形化
1.當然是先安裝Beyond Compare3 (此處省略安裝步驟，自行百度)

 

2.設置difftool

git config --global diff.tool bc3
git config --global difftool.bc3.cmd "\"c:/program files/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""
git config --global difftool.prompt false

 

3.設置mergetool

git config --global merge.tool bc3
git config --global mergetool.bc3.cmd "\"c:/program files/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
git config --global mergetool.bc3.trustExitCode true

____________________________________________________________________________________________

使用時：

diff時，用git difftool <file_name>來查看就會直接彈出bcompare.

merge時，要先用git merge <branch_name> 來merge一下，然后如果提示merge有沖突，才用git mergetool來調用bcompare來merge

---------------------