From 1e5bfc5eae088f93f2570b80b55575c31173bb39 Mon Sep 17 00:00:00 2001
From: xerus <27jf@pm.me>
Date: Tue, 31 Mar 2020 22:32:43 +0200
Subject: [PATCH] Clean up git config

---
 .config/git/config | 46 ++++++++++++++++++++++++----------------------
 .config/git/ignore | 21 +++++++++------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index c1831b3..712fd6b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,39 +1,41 @@
-[credential]
-	helper = store
-[user]
-	email = 27jf@web.de
-	name = Xerus
 [core]
 	autocrlf = input
 	editor = nvim
+[diff]
+	tool = meld
+[submodule]
+	recurse = true
+[rerere]
+	enabled = true
+# Accelerate packing by automatically determining thread count
+[pack]
+	threads = 0
+
+# Automatically push to branch with matching name
 [push]
 	default = current
+# Disable pagination for branch commmand by default
 [pager]
 	branch = false
+[grep]
+	lineNumber
+
 [color "status"]
 	added = green
 	changed = yellow
-	untracked = red
-[pack]
-	threads = 3
-[submodule]
-	recurse = true
+	untracked = magenta
+
+[user]
+	email = 27jf@pm.me
+	name = xerus
+
 [alias]
 	curbranch = symbolic-ref --short HEAD
 	root = rev-parse --show-toplevel
 	dir = !git root | sed 's/$/\\/.git/g'
-[rerere]
-	enabled = true
-[code]
-	editor = kate
-[github]
-	user = Xerus2000
-[ghi]
-	token = 32ae6d2b42aa78d823cfbd62a3ed765bf14c8b44
-[diff]
-	tool = meld
+
 [filter "lfs"]
+	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
-	required = true
-	clean = git-lfs clean -- %f
+	required
diff --git a/.config/git/ignore b/.config/git/ignore
index 25eb774..ce03106 100755
--- a/.config/git/ignore
+++ b/.config/git/ignore
@@ -1,25 +1,23 @@
-# User-specific stuff
+# IDEA
+## User-specific files
 **/.idea/**/workspace.xml
 **/.idea/**/tasks.xml
 **/.idea/**/vcs.xml
 **/.idea/dictionaries
 **/.idea/inspectionProfiles
-**/.idea/.name
+**/.idea/caches
 **/.idea/markdown-*
 **/.idea/compiler.xml
 **/.idea/misc.xml
 **/.idea/modules.xml
-**/.idea/caches
 **/.idea/encodings.xml
 **/.idea/kotlinScripting.xml
 **/.idea/jarRepositories.xml
-
-## Unecessary IDEA stuff
-*.iws
+**/.idea/.name
 **/*.iml
-out/
+#*.iws
 
-# Sensitive or high-churn files
+## Sensitive or high-churn files
 **/.idea/**/dataSources/
 **/.idea/**/dataSources.ids
 **/.idea/**/dataSources.xml
@@ -28,11 +26,10 @@ out/
 **/.idea/**/dynamic.xml
 **/.idea/**/uiDesigner.xml
 
-# Gradle
+# Build
 **/.idea/**/gradle.xml
 **/.idea/**/libraries
-.gradle/
+**/.gradle/
 build/
-
-# Build
+out/
 .kotlintest