Linux using Beyon compare4 as Git diff tool

来源:互联网 发布:mac键盘大写灯不亮 编辑:程序博客网 时间:2024/06/06 19:31

下載及安ufye Beyon Compare 4

     http://www.scootersoftware.com/download.php?zz=kb_linux_install


=========================================

.gitconfig


[user]
    name =your_name
    email = your_email
[color]
    ui = true
[core]
    editor = vim
;[merge]
    ;tool = bc
[diff]
    external = /root/.git-diff-wrapper.sh
[merge]
    tool = bc
[mergetool "bc"]
    cmd = bcompare \
    "$PWD/$LOCAL" \
    "$PWD/$REMOTE" \
    "$PWD/$BASE" \
    "$PWD/$MERGED"
    keepBackup = false
    trustExitCode = false


===========================================

content  of file   /root/.git-diff-wrapper.sh is



#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
/usr/bin/bcompare "$2" "$5" | cat

================================================


0 0
原创粉丝点击