46 lines
895 B
Text
46 lines
895 B
Text
[core]
|
|
editor = nvim
|
|
# Only page if more than one screen
|
|
pager = "less -FX"
|
|
|
|
[color]
|
|
branch = auto
|
|
diff = auto
|
|
interactive = auto
|
|
status = auto
|
|
|
|
[credential]
|
|
helper = cache --timeout=604800
|
|
|
|
[diff]
|
|
tool = nvimdiff
|
|
[difftool "nvimdiff"]
|
|
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
|
|
|
[http]
|
|
postBuffer = 524288000
|
|
version = HTTP/2
|
|
[pull]
|
|
rebase = false
|
|
[safe]
|
|
directory = /opt/homebrew
|
|
[init]
|
|
defaultBranch = main
|
|
[merge]
|
|
tool = "nvim"
|
|
conflictstyle = diff3
|
|
|
|
[mergetool]
|
|
keepBackup = false
|
|
prompt = true
|
|
|
|
[mergetool "nvim"]
|
|
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
|
|
|
|
# Set a correct user.name and user.email for work projects
|
|
[includeIf "gitdir:~/git/work/"]
|
|
path = ~/git/work/gitconfig
|
|
|
|
# Set a correct user.name and user.email for personal projects
|
|
[includeIf "gitdir:~/git/lugh/"]
|
|
path = ~/git/lugh/gitconfig
|