From 8a1c23073081e92f12a9178f9d1f91c1b0d2c499 Mon Sep 17 00:00:00 2001
From: Gregory Eremin <root@localhost>
Date: Thu, 5 Oct 2017 13:20:00 +0200
Subject: [PATCH] Clenup git config

---
 git/gitconfig | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 62f1e4a..92bf91f 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -1,9 +1,8 @@
 [hub]
   protocol = https
 [user]
-  name = Gregory Eremin
-  email = g@erem.in
-	signingkey = EC26E86C
+	name = Gregory Eremin
+	email = root@localhost
 [credential]
   helper = osxkeychain
 [alias]
@@ -42,15 +41,6 @@
   autocorrect = 1
 [achievement]
   upload = true
-[difftool "Kaleidoscope"]
-  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
-[diff]
-  tool = Kaleidoscope
-[mergetool "Kaleidoscope"]
-  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
-  trustExitCode = true
-[merge]
-  tool = Kaleidoscope
 [filter "media"]
 	required = true
 	clean = git media clean %f
@@ -60,9 +50,10 @@
 	smudge = git hawser smudge %f
 	required = true
 [filter "lfs"]
-	clean = git lfs clean %f
-	smudge = git lfs smudge %f
 	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
 [url "ssh://git@github.com/"]
 	insteadOf = https://github.com/
 [color "diff-highlight"]
@@ -70,3 +61,5 @@
 	oldHighlight = red bold 52
 	newNormal = green bold
 	newHighlight = green bold 22
+[gpg]
+	program = gpg2