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

     1

     2

OPTIONS=color,hilite_pet,news

     3

OPTIONS=number_pad

     4

OPTIONS=!autopickup

     5

     6

OPTIONS=name:gavenkoa

     7

OPTIONS=catname:Catty

     8

OPTIONS=dogname:Doggy

     9

OPTIONS=horsename:Loshadka

    10