beyond compare 与git diff整合

在UserName/bin/目录下新建一个git-diff-wrapper.sh

#!/bin/sh

# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode

"bcompare" "$2" "$5" | cat

 

在UserName/目录下修改.gitconfig文件

[user]
name = wanqi
email = wanqi@hymost.com
[color]
ui = auto
[diff]
external = /home/UserName/bin/git-diff-wrapper.sh

 

最后就git diff就ok了。