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
================================================
- Linux using Beyon compare4 as Git diff tool
- Beyond Compare as a Diff and Merge tool with Git
- git gui diff/merge tool
- Linux diff 与 git diff
- git linux diff
- compare4
- linux git diff 有颜色
- Linux的diff和git diff生成patch/打patch
- Ubuntu svn diff tool
- linux 中关于git diff的配置
- Linux下git diff对比两个文件夹
- Linux下Beyond Compare4的破解使用
- Git diff
- git diff
- git diff
- git diff
- git diff
- Git diff
- Monkey之Log分析
- Arrays.asList() 返回的list不能add,remove
- 用brk实现sbrk,关于brk的返回值
- swift 单例模式
- SPRING 简介
- Linux using Beyon compare4 as Git diff tool
- 带checkbox的ListView实现(一)——数据与渲染完全分离的传统实现方式
- UI界面-绝对布局
- 带checkbox的ListView实现(二)——自定义Checkable控件的实现方法
- 编程之美-24点游戏方法整理
- 盘点JavaScript里好用的原生API
- 带checkbox的ListView实现(三)——CheckableImageView的实现方法
- swift 对象类型转换
- MIPI-技术浅谈