mirror of
https://github.com/olexsmir/dotfiles.git
synced 2026-01-15 08:41:34 +02:00
git: upgrade config
This commit is contained in:
parent
3cd776904c
commit
e3f3b25a5c
1 changed files with 10 additions and 1 deletions
11
gitconfig
11
gitconfig
|
|
@ -20,7 +20,7 @@
|
||||||
defaultBranch = "main"
|
defaultBranch = "main"
|
||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
push-fwl = push --force-with-lease
|
push-force = push --force-with-lease
|
||||||
pu = push
|
pu = push
|
||||||
l = log --oneline --decorate
|
l = log --oneline --decorate
|
||||||
lg = log --oneline --graph --all
|
lg = log --oneline --graph --all
|
||||||
|
|
@ -34,6 +34,9 @@
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
|
|
||||||
|
[rerere]
|
||||||
|
enabled = true
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = default
|
colorMoved = default
|
||||||
|
|
||||||
|
|
@ -59,3 +62,9 @@
|
||||||
plus-empty-line-marker-style = syntax "#20303b"
|
plus-empty-line-marker-style = syntax "#20303b"
|
||||||
line-numbers-plus-style = "#266d6a"
|
line-numbers-plus-style = "#266d6a"
|
||||||
line-numbers-zero-style = "#3b4261"
|
line-numbers-zero-style = "#3b4261"
|
||||||
|
|
||||||
|
[column]
|
||||||
|
ui = auto
|
||||||
|
|
||||||
|
[branch]
|
||||||
|
sort = -committerdate
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue