Skip to content

Instantly share code, notes, and snippets.

@izmailoff

izmailoff/git_mergetool_setup.sh

Created April 8, 2020 02:27
Show Gist options
  • Save izmailoff/0d1c87c8f4d3bd1c3287e6392bbf868b to your computer and use it in GitHub Desktop.
Save izmailoff/0d1c87c8f4d3bd1c3287e6392bbf868b to your computer and use it in GitHub Desktop.
Download ZIP
git mergetool setup
Raw
git_mergetool_setup.sh
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment