git gui diff/merge tool
2011-12-28 11:11
387 查看
Download and Install P4V
Download the free Perforce Visual Clientdmg from here. Once it’s downloaded, copy
p4mergefrom the disk image to your
/Applicationsdirectory.
Write some simple shell scripts
p4merge*
Create a new text file in/usr/local/bincalled
p4mergeand add the following lines:
#!/bin/sh /Applications/p4merge.app/Contents/MacOS/p4merge $*
Make the script executable by entering this command:
chmod +x p4merge
p4diff*
Create a new text file in/usr/local/bincalled
p4diffand add the following lines:
#!/bin/sh [ $# -eq 7 ] && /usr/local/bin/p4merge "$2" "$5"
Make the script executable by entering this command:
chmod +x p4diff
Configure Git to use the scripts
Open your git configuration file (probably~/.gitconig) and add these lines:
[merge] keepBackup = false; tool = p4merge [mergetool "p4merge"] cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED" [code]prompt = false
keepTemporaries = false
trustExitCode = false
keepBackup = false
[diff]
external = p4diff[/code]
相关文章推荐
- Beyond Compare as a Diff and Merge tool with Git
- Use vimdiff as git mergetool
- 让GIT DIFF/MERGE使用MELD等GUI对比工具
- 让git diff/merge使用meld等GUI对比工具
- git diffmerge tool 配置
- git mergetool
- Git mergetool 插件
- windows下使用meld作为git mergetool
- OS X升级El Capitan后,git difftool无法打开diffmerge的解决方法
- 02_创建Git仓库,克隆仓库,git add,git commit,git push,git pull,同行冲突,不同行冲突的结局方案,git mergetool的使用
- 02_创建Git仓库,克隆仓库,git add,git commit,git push,git pull,同行冲突,不同行冲突的结局方案,git mergetool的使用
- git diff/merge 配置
- git merge —— 为什么比diff & patch好
- 用Beyond Compare代替git的difftool和mergetool
- Howto use vimdiff as "git diff"'s diff tool
- Git配置可视化的diff 和merge工具
- git difftool bcompare
- cygwin下配置git difftool
- git mergetool 解决冲突的问题
- windows下使用winmerge作为git difftool