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

+
−
+
−OPTIONS=color,hilite_pet,news
+
−OPTIONS=number_pad
+
−OPTIONS=!autopickup
+
−
+
−OPTIONS=name:gavenkoa
+
−OPTIONS=catname:Catty
+
−OPTIONS=dogname:Doggy
+
−OPTIONS=horsename:Loshadka
+
−