git for Windows10 update

diff --git a/.config/git/config b/.config/git/config
index 4d9d1aa3a602052ceffdaacf2513ea52dc5519d5..07110c3f81a216e85d4834858a15f632a772efef 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -64,13 +64,13 @@
        # List contributors with number of commits
        contributors = shortlog --summary --numbered
 
-       k = !gitk
-       visual = !gitk
+#      k = !gitk
+#      visual = !gitk
 
-       ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
-       gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
-       cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
-       mydiff = difftool --dir-diff --tool=bc --no-prompt
+#      ctags = "!sh -c '[ -f .git/hooks/ctags ] || git init; .git/hooks/ctags' git-ctags"
+#      gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
+#      cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
+#      mydiff = difftool --dir-diff --tool=bc --no-prompt
 
 [help]
        autocorrect = 10
@@ -106,17 +106,15 @@
 [init]
        templatedir = ~/.config/git/templates
 [core]
-       excludesfile =
-       attributesFile = ~/.config/git/attributes
+#      excludesfile =
+#      attributesFile = ~/.config/git/attributes
        editor = vim
 #      eol = native
-       autocrlf = false
+  autocrlf = true
 [include]
-       path = ~/.config/git/config_local
+#      path = ~/.config/git/config_local
 [filter "lfs"]
        clean = git-lfs clean -- %f
        smudge = git-lfs smudge -- %f
        process = git-lfs filter-process
        required = true
-[gui]
-       recentrepo = C:/Projects/repos/grundfos/jaz/genilog

diff --git a/.vimrc b/.vimrc
index 8a5439ea71b31ea672929b9d31ab649f54aeb9c1..0a5522802c972d2bc2daeceed07055f9e2830b4a 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -322,7 +322,8 @@ if (&t_Co > 2 || has("gui_running")) && has("syntax")
     elseif has("unix")
       set guifont=inconsolata\ 11
     elseif has("win32")
-      set guifont=consolas:h11,courier\ new:h10
+"      set guifont=consolas:h11,courier\ new:h10
+      set guifont=Consolas:h10:cANSI:qDRAFT
     endif
   endif