From e3f3b25a5c6f87358eac39ecc9e9ee3fea50947e Mon Sep 17 00:00:00 2001
From: Smirnov Oleksandr <ss2316544@gmail.com>
Date: Fri, 11 Oct 2024 21:49:18 +0300
Subject: [PATCH] git: upgrade config

---
 gitconfig | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index e03048d..d8f3911 100644
--- a/gitconfig
+++ b/gitconfig
@@ -20,7 +20,7 @@
     defaultBranch = "main"
 
 [alias]
-    push-fwl = push --force-with-lease
+    push-force = push --force-with-lease
     pu = push
     l = log --oneline --decorate
     lg = log --oneline --graph --all
@@ -34,6 +34,9 @@
 [merge]
     conflictstyle = diff3
 
+[rerere]
+    enabled = true
+
 [diff]
     colorMoved = default
 
@@ -59,3 +62,9 @@
     plus-empty-line-marker-style  = syntax "#20303b"
     line-numbers-plus-style       = "#266d6a"
     line-numbers-zero-style       = "#3b4261"
+
+[column]
+    ui = auto
+
+[branch]
+    sort = -committerdate