diff --git a/Makefile b/Makefile
index 7f29f57..0eb0e86 100644
--- a/Makefile
+++ b/Makefile
@@ -293,6 +293,7 @@ else
 	$(git_conf) core.autocrlf false
 	$(git_conf) core.excludesfile '~/.gitignore'
 	$(git_conf) core.commentChar ";"
+	$(git_conf) core.notesRef true
 	$(git_conf) color.ui auto
 	$(git_conf) status.relativePaths false
 	$(git_conf) status.showUntrackedFiles normal
diff --git a/emacs.el b/emacs.el
index a039eb2..551e0ab 100644
--- a/emacs.el
+++ b/emacs.el
@@ -1865,6 +1865,7 @@ ORIG-FUNC is the target function, and ARGS is the argument when it is called."
                       :inverse-video t)
   ;; Annoying !
   ;;(diff-auto-refine-mode)
+  (set-variable 'diff-refine nil)
   )
 
 ;; (ffap-bindings)