94 lines
1.6 KiB
INI
94 lines
1.6 KiB
INI
# _____ _ _
|
|
# | __ (_) |
|
|
# | | \/_| |_
|
|
# | | __| | __|
|
|
# | |_\ \ | |_
|
|
# \____/_|\__|
|
|
# -----------------------------------------------------------------------------
|
|
# :: Git Configuration
|
|
# :: https://git-scm.com
|
|
# :: Marvin Elsen <contact@marvinelsen.com>
|
|
#
|
|
# :: See: https://jvns.ca/blog/2024/02/16/popular-git-config-options/
|
|
# :: See: https://blog.gitbutler.com/how-git-core-devs-configure-git/
|
|
# -----------------------------------------------------------------------------
|
|
|
|
[include]
|
|
path = ~/.config/delta/themes/catppuccin.gitconfig
|
|
|
|
[core]
|
|
editor = nvim
|
|
autocrlf = input
|
|
pager = delta
|
|
excludesFiles = ~/.gitignore
|
|
|
|
[column]
|
|
ui = auto
|
|
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
|
|
[delta]
|
|
features = catppuccin-macchiato
|
|
navigate = true
|
|
light = false
|
|
line-numbers = true
|
|
|
|
[merge]
|
|
conflictstyle = zdiff3
|
|
|
|
[diff]
|
|
colorMoved = plain
|
|
algorithm = histogram
|
|
mnemonicPrefix = true
|
|
renames = true
|
|
|
|
[rebase]
|
|
autoSquash = true
|
|
autoStash = true
|
|
updateRefs = true
|
|
|
|
[push]
|
|
default = simple
|
|
autoSetupRemote = true
|
|
followTags = true
|
|
|
|
[fetch]
|
|
prune = true
|
|
pruneTags = true
|
|
all = true
|
|
|
|
[pull]
|
|
rebase = true
|
|
|
|
[init]
|
|
defaultBranch = main
|
|
|
|
[commit]
|
|
verbose = true
|
|
|
|
[rerere]
|
|
enabled = true
|
|
autoupdate = true
|
|
|
|
[help]
|
|
autocorrect = prompt
|
|
|
|
[log]
|
|
date = iso
|
|
|
|
[branch]
|
|
sort = -committerdate
|
|
|
|
[color]
|
|
ui = auto
|
|
|
|
[tag]
|
|
sort = version:refname
|
|
|
|
# See: https://git-scm.com/docs/git-config#_includes
|
|
[includeIf "gitdir:~/src/personal/**"]
|
|
path = ~/.gitconfig-personal
|
|
[includeIf "gitdir:~/src/work/**"]
|
|
path = ~/.gitconfig-work
|