Set git config pull.rebase = false
1 files changed, 2 insertions(+), 0 deletions(-) M git/gitconfig
M git/gitconfig => git/gitconfig +2 -0
@@ 15,3 15,5 @@ conflictstyle = diff3 [include] path = ~/.config/git/gitconfig_user +[pull] + rebase = false