sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git: gitconfig: Use merge as default strategy for git pull

Browse source 
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
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git/.gitconfig
View file

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