From 7e09c33898a9ebb9ec9f2962d020c2a5a7a8e36a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4abk3g@protonmail.com>
Date: Mon, 28 Jun 2021 12:48:11 +0200
Subject: [PATCH] Add git configuration

---
 general/.config/git/config | 94 ++++++++++++++++++++++++++++++++++----
 1 file changed, 84 insertions(+), 10 deletions(-)

diff --git a/general/.config/git/config b/general/.config/git/config
index 99a1b19..835f415 100644
--- a/general/.config/git/config
+++ b/general/.config/git/config
@@ -1,26 +1,100 @@
 [user]
-	name = h7x4
-	email = h7x4abk3g@protonmail.com
+  name = h7x4
+  email = h7x4abk3g@protonmail.com
+
+[init]
+  defaultBranch = main
 
 [alias]
-	uncommit = "reset --soft HEAD^"
+  aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
+  uncommit = "reset --soft HEAD^"
   rev = "checkout HEAD -- "
   revall = "checkout ."
   unadd = "rm --cached "
-	delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
+  delete-merged = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
+
+  mkbr = "checkout -b"
+  mvbr = "branch -m"
+  rmbr = "branch -d"
+  rrmbr = "push origin --delete"
 
   graph = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all"
   graphv = "log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all"
   g = !"git graph"
 
+[core]
+  excludesfile = ~/.gitignore
+  attributesfile = ~/.gitattributes
+
+  # Treat spaces before tabs and all kinds of trailing whitespace as an error.
+  # [default] trailing-space: looks for spaces at the end of a line
+  # [default] space-before-tab: looks for spaces before tabs at the beginning of a line
+  whitespace = space-before-tab,-indent-with-non-tab,trailing-space
+
+  precomposeunicode = false
+  untrackedCache = true
+
+  editor = nvim
+  pager = less
+
 [color]
-	ui = auto
+  ui = auto
 
 [github]
-	user = h7x4abk3g
+  user = h7x4abk3g
 
 [filter "lfs"]
-	required = true
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	clean = git-lfs clean -- %f
+  required = true
+  smudge = git-lfs smudge -- %f
+  process = git-lfs filter-process
+  clean = git-lfs clean -- %f
+
+[diff]
+  mnemonicPrefix = true
+  renames=true
+  tool = nvimdiff
+[merge]
+  tool = nvimdiff
+  conflictstyle = diff3
+[mergetool]
+  keepBackup = false 
+[mergetool "nvimdiff"]
+  cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'"
+
+[grep]
+  break = true
+  heading = true
+  lineNumber = true
+  extendedRegexp = true
+
+# URL Stuff
+
+[url "git@github.com:"]
+  insteadOf = "gh:"
+  pushInsteadOf = "github:"
+  pushInsteadOf = "git://github.com/"
+
+[url "git://github.com/"]
+  insteadOf = "github:"
+
+[url "git@gist.github.com:"]
+  insteadOf = "gst:"
+  pushInsteadOf = "gist:"
+  pushInsteadOf = "git://gist.github.com/"
+
+[url "git://gist.github.com/"]
+  insteadOf = "gist:"
+
+[url "aur@aur.archlinux.org:"]
+  insteadOf = "aur:"
+  pushInsteadOf = "aur:"
+  pushInsteadOf = "git://aur.archlinux.org/"
+
+[url "git@gitlab.stud.idi.ntnu.no"]
+  insteadOf = "ntnu:"
+  pushInsteadOf = "ntnu:"
+  pushInsteadOf = "git://gitlab.stud.idi.ntnu.no/"
+
+# Colors
+[color "branch"]
+  upstream = cyan