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

gnu-emacs: yes

     2

tab-size: 2

     3

indent: auto

     4

indent-cdata: no

     5

indent-attributes: yes

     6

indent-spaces: 2

     7

punctuation-wrap: no

     8

wrap: 120

     9

wrap-attributes: yes

    10

newline: LF