changeset 944:3d45cf758a42

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
author Oleksandr Gavenko <gavenkoa@gmail.com>
date Tue, 25 Aug 2020 10:15:42 +0300
parents 471aa765a68a
children b14781b95dfa
files .gitconfig
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
+