From c8d910ad6bd3fe466adc87e9bfc37028f27e2768 Mon Sep 17 00:00:00 2001
From: Kacper Donat <kadet1090@gmail.com>
Date: Sun, 4 Feb 2024 16:44:43 +0100
Subject: [PATCH] git: Allow .local gitconfig

---
 .gitconfig | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 384e933..5603f30 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,12 +1,9 @@
 [user]
-	name = Kacper Donat
+    name = Kacper Donat
     email = kadet1090@gmail.com
 
 [alias]
-    st = status
-    ci = commit
     co = checkout
-    br = branch
 
     unstage = reset HEAD --
     last = log -1 HEAD
@@ -15,16 +12,25 @@
     ktokurwa = blame
 
 [push]
-	default = current
+    default = current
+	autoSetupRemote = true
 
 [merge "ours"]
     driver = true
 
 [core]
-	excludesfile = ~/.gitignore
+    excludesfile = ~/.gitignore
     autocrlf = input
+	commentchar = ";"
 
 [mergetool "nvimdiff"]
-  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+    cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+
 [difftool]
-	tool = nvimdiff
+    tool = nvimdiff
+
+[rebase]
+    autosquash = true
+
+[include]
+    path = ~/.gitconfig.local