mirror of
https://github.com/olexsmir/dotfiles.git
synced 2026-01-15 08:41:34 +02:00
git: update config
This commit is contained in:
parent
a6fa85b1d0
commit
360c63f270
1 changed files with 26 additions and 2 deletions
28
gitconfig
28
gitconfig
|
|
@ -32,13 +32,22 @@
|
||||||
diffFilter = delta --color-only
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = zdiff3
|
||||||
|
|
||||||
|
[rebase]
|
||||||
|
autoSquash = true
|
||||||
|
autoStash = true
|
||||||
|
updateRefs = true
|
||||||
|
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
autoupdate = true
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = default
|
algorithm = histogram
|
||||||
|
colorMoved = true
|
||||||
|
mnemonicPrefix = true
|
||||||
|
renames = true
|
||||||
|
|
||||||
[delta]
|
[delta]
|
||||||
features = tokyonight
|
features = tokyonight
|
||||||
|
|
@ -71,6 +80,21 @@
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
|
verbose = true
|
||||||
|
|
||||||
[fetch]
|
[fetch]
|
||||||
writeCommitGraph = true
|
writeCommitGraph = true
|
||||||
|
prune = true
|
||||||
|
pruneTags = true
|
||||||
|
all = true
|
||||||
|
|
||||||
|
[tag]
|
||||||
|
sort = version:refname
|
||||||
|
|
||||||
|
[push]
|
||||||
|
default = simple
|
||||||
|
autoSetupRemote = true
|
||||||
|
followTags = true
|
||||||
|
|
||||||
|
[help]
|
||||||
|
autocorrect = prompt
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue