dotfiles/git/.gitconfig

57 lines
1.2 KiB
INI

[user]
name = Sanchayan Maity
email = sanchayan@sanchayanmaity.net
login = sanchayanmaity
[core]
editor = nvim
excludesfile = ~/.config/git/ignore
[color]
ui = true
[sendemail]
smtpserver = /usr/bin/msmtp
[http]
sslVerify = false
[fetch]
prune = true
pruneTags = true
[diff]
tool = nvimdiff
[difftool]
prompt = false
trustExitCode = true
[difftool "nvimdiff"]
cmd = nvim -R -d $LOCAL $REMOTE
[difftool "difftastic"]
cmd = difft $LOCAL $REMOTE
[difftool "kitty"]
cmd = kitty +kitten diff $LOCAL $REMOTE
[merge]
tool = diffconflicts
conflictstyle = diff3
ff = only
[mergetool]
prompt = false
keepBackup = false
[mergetool "diffconflicts"]
cmd = nvim -c DiffConflicts $MERGED $BASE $LOCAL $REMOTE
trustExitCode = true
[rebase]
autosquash = true
autoStash = true
[commit]
verbose = true
[pull]
rebase = false
[push]
default = nothing
[advice]
addEmptyPathspec = false
[init]
defaultBranch = master
[log]
follow = true
[blame]
# Mark any lines that have had a commit skipped using --ignore-rev with a `?`
markIgnoredLines = true
# Mark any lines that were added in a skipped commit and can not be attributed with a `*`
markUnblamableLines = true