Mac下配置可视化git diff工具

1. 下载软件
https://www.perforce.com/downloads/visual-merge-tool
若是页面打不开，就经过官网查询，搜索一下p4merge

2. 找到软件的执行路径
安装完成之后，默认的执行文件在 /Applications/p4merge.app/Contents/MacOS/p4merge

3. 建立2个脚本
/usr/local/bin/gitmerge.sh

#!/bin/sh
/Applications/p4merge.app/Contents/MacOS/p4merge $*

/user/local/bin/gitdiff.sh

#!/bin/sh
[ $# -eq 7 ] && /usr/local/bin/gitmerge "$2" "$5"

设置文件权限
chmod 755 gitmerge.sh  gitdiff.sh

4. 配置git选项

git config --global merge.tool gitmerge
git config --global mergetool.gitmerge.cmd 'gitmerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
git config --global mergetool.trustExitCode false
git config --global diff.external gitdiff

或者能够直接修改 ~/.gitconfig文件

5. 使用
查看2个branch的修改文件列表
$ git diff --stat ANOTHER-BRANCH

用p4merge查看2个branch当个文件的修改
$ git diff ANOTHER-BRANCH "DIFF-FILE-PATH"