下载
安装
解压:
sudo tar -zxvf p4v.tgz -C /opt
重命名:
cd /opt | sudo mv p4v-2015.2.1315639 p4merge
增加可执行权限:
cd p4merge/bin | sudo chmod +x p4merge
创建软链:
sudo ln -s /opt/p4merge/bin/p4merge /usr/local/bin/p4merge
配置
- 修改git配置:
vi ~/.gitconfig
在文件的末尾追加以下内容:
[merge]
keepBackup = false
tool = p4merge
[mergetool]
prompt = false
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
tool = p4merge
[difftool]
prompt = false
[difftool "p4merge"]
cmd = p4merge "$LOCAL" "$REMOTE"
keepTemporaries = false
trustExitCode = false
keepBackup = false
修改后保存退出。
启动
git difftool
小推荐
- 查看当前系统支持哪些git diff插件:
git difftool --tool-help
- 配置核心编辑器:
git config --global core.editor vim
- 工具:
gitg, git gui
, 两者都可以使用apt-get安装. - 用图表(ASCII字符串)形象输出日志记录:
git log --oneline --graph
参考链接: P4Merge & Installing P4 & Git-SCM & Git Book