More tools and improvements

Signed-off-by: Jacob Kiers <kiers@comandi.nl>

tilde/gitconfig

@@ -15,7 +15,8 @@
     editor = vim -f
     # http://stackoverflow.com/questions/136178/git-diff-handling-long-lines
     # If doesn't work, try: pager = less -+$LESS -FRX
-    pager = less -r
+    pager = diff-highlight | less -RFX
+#    pager = less -r
     autocrlf = false
     safecrlf = false
     mergeoptions = --no-edit
@@ -70,11 +71,16 @@
 
 # DiffMerge
 [merge]
+    ff = no
+    commit = no
     tool = diffmerge
 [mergetool "diffmerge"]
     cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
     trustExitCode = true
 [diff]
+    algorithm = minimal
+    compationHeuristic = true
+    renames = true
     tool = diffmerge
 [difftool "diffmerge"]
     cmd = diffmerge $LOCAL $REMOTE
@@ -91,3 +97,5 @@
 
 [init]
     templatedir = ~/dotfiles/resources/git-template
+[pull]
+	ff = yes