1.查看config
git config --list
可以列出所有config配置
1 user.email=tang_m_cong@163.com 2 user.name=thomas 3 core.editor=vim 4 alias.co=checkout 5 alias.br=branch 6 alias.ci=commit 7 alias.st=status 8 alias.last=log -1 HEAD 9 alias.d=difftool 10 color.diff=auto 11 color.status=auto 12 color.branch=auto 13 diff.tool=bc3 14 difftool.bc3.path=/usr/bin/bcompare 15 merge.tool=bc3 16 mergetool.bc3.path=usr/bin/bcompare 17 difftool.prompt=false 18 mergetool.prompt=false 19 core.repositoryformatversion=0 20 core.filemode=true 21 core.bare=false 22 core.logallrefupdates=true 23 remote.origin.url=https://git.oschina.net/thammer/hisimain.git 24 remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* 25 branch.master.remote=origin 26 branch.master.merge=refs/heads/master
2.常用config：
git config --global diff.tool bc3
git config --global difftool.bc3.path "/usr/bin/bcompare"
git config --global difftool.prompt false
git config --global alias.d difftool
后续补充
原文：http://www.cnblogs.com/thammer/p/4687751.html