欢迎您访问程序员文章站本站旨在为大家提供分享程序员计算机编程知识!
您现在的位置是: 首页

linux 下配置可视化git 冲突合并工具kdiff3

程序员文章站 2024-02-12 11:01:58
...

linux 下配置可视化git 冲突合并工具kdiff3

原文连接:

http://www.bigsoft.co.uk/blog/2018/05/18/git-and-kdiff3
https://*.com/questions/33308482/git-how-configure-kdiff3-as-merge-tool-and-diff-tool

内容:

Git and Kdiff3

Posted by davidnewcomb on 18 May 2018 in Source Control

Kdiff3 has been my favourite diff tool for a while and I always have to look up how to configure it to be automatically launched when using Git from the command line. So it’s going in the blog!

For Linux

sudo apt-get update
sudo apt-get install kdiff3

git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path "/usr/bin/kdiff3"
git config --global --add mergetool.kdiff3.trustExitCode false
git config --global --add mergetool.prompt false

git config --global --add diff.guitool kdiff3
git config --global --add difftool.kdiff3.path "/usr/bin/kdiff3"
git config --global --add difftool.kdiff3.trustExitCode false
git config --global --add difftool.prompt false
相关标签: git 相关