olexsmir/dotfiles
1
Fork 0
mirror of https://github.com/olexsmir/dotfiles.git synced 2026-01-15 08:41:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Oleksandr Smirnov 2025-06-29 13:53:50 +03:00
parent e19c3f6342
commit aa51c13b48
No known key found for this signature in database
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gitconfig
View file

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