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>
This commit is contained in:
Sanchayan Maity 2020-06-13 14:15:10 +05:30
parent d662824b9f
commit 6bca8ccaad

View file

@ -20,3 +20,5 @@
keepBackup = false
[commit]
verbose = true
[pull]
rebase = false