dotfiles: aa51c13

1 files changed, 7 insertions(+), 9 deletions(-)

git: rebase on pull, change push strategy, remove nvim diffview

Author: Oleksandr Smirnov olexsmir@gmail.com

Committed at: 2025-06-29 13:53:50 +0300

Parent: e19c3f6

M gitconfig

@@ -10,7 +10,7 @@ program = gpg2
     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 @@ [tag]
     sort = version:refname
 
 [push]
-    default = simple
+    default = current
     autoSetupRemote = true
     followTags = true
+
+[pull]
+    rebase = true
 
 [help]
     autocorrect = prompt