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

--color-lineno=blue
--color-filename=bold red
--color-match=black on_yellow

--type-set=nsis=.nlf,.nsh