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:
parent
d662824b9f
commit
6bca8ccaad
1 changed files with 2 additions and 0 deletions
|
@ -20,3 +20,5 @@
|
|||
keepBackup = false
|
||||
[commit]
|
||||
verbose = true
|
||||
[pull]
|
||||
rebase = false
|
||||
|
|
Loading…
Reference in a new issue