dotfiles/git/.gitconfig
Sanchayan Maity 6bca8ccaad git: gitconfig: Use merge as default strategy for git pull
git config pull.rebase false  # merge (the default strategy)
git config pull.rebase true   # rebase
git config pull.ff only       # fast-forward only

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-06-13 14:15:10 +05:30

24 lines
474 B
INI

[user]
name = Sanchayan Maity
email = maitysanchayan@gmail.com
login = sanchayanmaity
[core]
editor = "nvim"
pager = delta --dark
excludesfile = ~/.config/git/ignore
[color]
ui = auto
[sendemail]
smtpserver = /usr/bin/msmtp
[http]
sslVerify = false
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
trustExitCode = true
keepBackup = false
[commit]
verbose = true
[pull]
rebase = false