dotfiles/git/.gitconfig

48 lines
827 B
INI
Raw Normal View History

2016-03-07 17:31:28 +01:00
[user]
name = Sanchayan Maity
2021-02-11 18:49:38 +01:00
email = sanchayan@sanchayanmaity.net
login = sanchayanmaity
2016-03-07 17:31:28 +01:00
[core]
editor = "nvim"
pager = nvim -R
excludesfile = ~/.config/git/ignore
2016-03-07 17:31:28 +01:00
[color]
ui = true
pager = no
2016-03-07 17:31:28 +01:00
[sendemail]
smtpserver = /usr/bin/msmtp
[http]
sslVerify = false
[fetch]
prune = true
2020-10-05 14:28:25 +02:00
pruneTags = true
[diff]
tool = nvimdiff
[difftool "nvimdiff"]
cmd = nvim -R -d "$LOCAL" "$REMOTE"
[merge]
tool = diffconflicts
conflictstyle = diff3
ff = only
[mergetool]
prompt = false
keepBackup = false
[mergetool "diffconflicts"]
2021-04-28 09:59:17 +02:00
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
2021-02-02 05:09:23 +01:00
[init]
defaultBranch = master
[log]
follow = true