# HG changeset patch # User Oleksandr Gavenko # Date 1598339742 -10800 # Node ID abefcbeca9a584d3b793fca926b0f1292c0f556d # Parent 487c394c0540315aa559cd24904cb0cc05be7baf New git on "git pull" asked to config one of: git config pull.rebase false # merge (the default strategy) git config pull.rebase true # rebase git config pull.ff only # fast-forward only diff -r 487c394c0540 -r abefcbeca9a5 .gitconfig --- a/.gitconfig Thu Mar 26 17:24:35 2020 +0200 +++ b/.gitconfig Tue Aug 25 10:15:42 2020 +0300 @@ -56,3 +56,6 @@ # Push only current brunch. default = simple +[pull] +ff = only +