From aa51c13b48f691eb3341bb5acc34a50ef1b62105 Mon Sep 17 00:00:00 2001
From: Oleksandr Smirnov <olexsmir@gmail.com>
Date: Sun, 29 Jun 2025 13:53:50 +0300
Subject: [PATCH] git: rebase on pull, change push strategy, remove nvim
 diffview

---
 gitconfig | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gitconfig b/gitconfig
index 4795673..c2d9c6c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,7 +10,7 @@
     format = ssh
 
 [gpg "ssh"]
-    allowedSignersFile = ~/.config/git_allowed_signers
+    allowedSignersFile = ~/.config/git/allowed_signers
 
 [core]
     editor = nvim
@@ -23,22 +23,17 @@
 [alias]
     push-force = push --force-with-lease
     pu = push
-    l = log --oneline --decorate
-    lg = log --oneline --graph --all
+    l = log --oneline --decorate --graph --all
     st = status -sb
     cm = commit -m
     sw = switch
 
 [interactive]
     diffFilter = delta --color-only
+    singlekey = true
 
 [merge]
     conflictstyle = zdiff3
-    tool = nvim-diffview
-
-[merge "nvim-diffview"]
-  cmd = "nvim +DiffviewOpen"
-  prompt = false
 
 [rebase]
     autoSquash = true
@@ -98,9 +93,12 @@
     sort = version:refname
 
 [push]
-    default = simple
+    default = current
     autoSetupRemote = true
     followTags = true
 
+[pull]
+    rebase = true
+
 [help]
     autocorrect = prompt