@@ -46,12 +46,18 @@
[fetch]
prune = true
+[pull]
+ ff = true
+
[push]
default = upstream
[diff]
tool = vimdiff
+[log]
+ decorate = true
[alias]
short = log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --patience
ff = merge --ff-only
