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

+
−plain=normal
+
−newtext=darkgreen
+
−oldtext=darkred
+
−diffstuff=magenta
+
−cvsstuff=darkblue