1 files changed,
7 insertions(+),
9 deletions(-)
Author:
Oleksandr Smirnov
olexsmir@gmail.com
Committed at:
2025-06-29 13:53:50 +0300
Parent:
e19c3f6
M
gitconfig
··· 10 10 format = ssh 11 11 12 12 [gpg "ssh"] 13 - allowedSignersFile = ~/.config/git_allowed_signers 13 + allowedSignersFile = ~/.config/git/allowed_signers 14 14 15 15 [core] 16 16 editor = nvim ··· 23 23 [alias] 24 24 push-force = push --force-with-lease 25 25 pu = push 26 - l = log --oneline --decorate 27 - lg = log --oneline --graph --all 26 + l = log --oneline --decorate --graph --all 28 27 st = status -sb 29 28 cm = commit -m 30 29 sw = switch 31 30 32 31 [interactive] 33 32 diffFilter = delta --color-only 33 + singlekey = true 34 34 35 35 [merge] 36 36 conflictstyle = zdiff3 37 - tool = nvim-diffview 38 - 39 -[merge "nvim-diffview"] 40 - cmd = "nvim +DiffviewOpen" 41 - prompt = false 42 37 43 38 [rebase] 44 39 autoSquash = true ··· 98 93 sort = version:refname 99 94 100 95 [push] 101 - default = simple 96 + default = current 102 97 autoSetupRemote = true 103 98 followTags = true 99 + 100 +[pull] 101 + rebase = true 104 102 105 103 [help] 106 104 autocorrect = prompt