aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2017-08-22 19:42:39 +0200
committerEgor Tensin <Egor.Tensin@gmail.com>2017-08-22 19:42:39 +0200
commit81521bb65dac2b76b3d5868208c37834e7673cce (patch)
tree321e6caaf76debc7e35101fce9c5a83f204e1390
parent.gitconfig: core.autocrlf = false (diff)
downloadlinux-home-81521bb65dac2b76b3d5868208c37834e7673cce.tar.gz
linux-home-81521bb65dac2b76b3d5868208c37834e7673cce.zip
.gitconfig: remove custom KDiff3 settings
It's supported by git anyway. The only inconvinience is that I'll have to confirm a mergetool every time there's a conflict, but meh.
Diffstat (limited to '')
-rw-r--r--%HOME%/.gitconfig10
1 files changed, 1 insertions, 9 deletions
diff --git a/%HOME%/.gitconfig b/%HOME%/.gitconfig
index ec18735..4776526 100644
--- a/%HOME%/.gitconfig
+++ b/%HOME%/.gitconfig
@@ -6,16 +6,8 @@
autocrlf = false
[push]
default = current
-[merge]
- tool = kdiff3
-[mergetool "kdiff3"]
+[mergetool]
keepBackup = false
- trustExitCode = false
-[diff]
- tool = kdiff3
-[difftool "kdiff3"]
- keepBackup = false
- trustExitCode = false
[pull]
ff = only
[alias]