設定 beyond compare 為 git diff 預設比對工具

以下為beyond compare 3為例子

1. 安裝完beyond compare後,先找到該執行檔名稱
~$ whereis bcompare
bcompare: /usr/bin/bcompare /usr/bin/X11/bcompare




2. 準備一隻shell script  bcompare-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


3. 修改shell script 權限
~$ chmod 777 ~/bin/bcompare-wrapper.sh


4. 在 ~/.gitconfig 加入下面config
[diff]
 tool = bcompare
 external = bcompare-wrapper.sh
[difftool]
 promp = false


5. 完成



  Example:
  修改linux kernel底下的READMD當例子,加了一行文字並存檔
  打git diff就會自動跳出 beyond compare 比對修改前與修改後的差異
~/linux/kernel$ geany README
~/linux/kernel$ git diff







沒有留言:

技術提供:Blogger.