From b3a100ca6fde9a8be5d5d02356d5476b8c21f000 Mon Sep 17 00:00:00 2001
From: Anton Zadvorny <thcheetah@gmail.com>
Date: Wed, 29 Jan 2020 20:51:01 +0300
Subject: [PATCH] Update .gitconfig

---
 home/.gitconfig | 82 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 56 insertions(+), 26 deletions(-)

diff --git a/home/.gitconfig b/home/.gitconfig
index 10c1210..910d244 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -1,29 +1,59 @@
-[hub]
-  protocol = https
-[user]
-	name  = Anton Zadvorny
-	email = thcheetah@gmail.com
-[credential]
-  helper = osxkeychain
-[color]
-  diff = auto
-  status = auto
-  branch = auto
-  ui = true
-[core]
-  excludesfile = ~/.gitignore
-  editor = vim
-	quotepath = false
 [apply]
-  whitespace = nowarn
-[mergetool]
-  keepBackup = false
-[difftool]
-  prompt = false
+  whitespace = fix
+
+[core]
+  editor = vim
+
+  excludesfile = ~/.gitignore
+  attributesfile = ~/.gitattributes
+
+  whitespace = space-before-tab,-indent-with-non-tab,trailing-space
+
+  trustctime = false
+  precomposeunicode = false
+  untrackedCache = true
+
+[color]
+  ui = auto
+
+[color "branch"]
+  current = yellow reverse
+  local = yellow
+  remote = green
+
+[color "diff"]
+  meta = yellow bold
+  frag = magenta bold # line info
+  old = red # deletions
+  new = green # additions
+
+[color "status"]
+  added = yellow
+  changed = green
+  untracked = cyan
+
+[diff]
+  renames = copies
+
+[diff "bin"]
+  textconv = hexdump -v -C
+
+[filter "lfs"]
+  process = git-lfs filter-process
+  required = true
+  clean = git-lfs clean -- %f
+  smudge = git-lfs smudge -- %f
+
 [help]
   autocorrect = 1
-[filter "lfs"]
-	process = git-lfs filter-process
-	required = true
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
+
+[merge]
+  log = true
+
+[push]
+  default = simple
+  followTags = true
+
+[user]
+  name  = Anton Zadvorny
+  email = thcheetah@gmail.com