git使用vimdiff做比较工具

[root@izbp18dv3a3metugyd02qxz syhuo.chart]# which vimdiff
/usr/bin/vimdiff
[root@izbp18dv3a3metugyd02qxz syhuo.chart]# ll /usr/bin/vimdiff
lrwxrwxrwx 1 root root 3 Nov 12 14:37 /usr/bin/vimdiff -> vim*

[root@izbp18dv3a3metugyd02qxz syhuo.chart]# vim ~/.gitconfig [diff] tool = vimdiff [difftool] prompt = false trustExitCode = true [color] ui = true [alias] st = status lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit br = branch d = difftool [user] email = [email protected] name = liuchao

猜你喜欢

转载自www.cnblogs.com/hnhycnlc888/p/12172622.html