From 23e455f588a0e35a16134cea75eba0f4cd0d5072 Mon Sep 17 00:00:00 2001
From: Jannik ZANDER <jzander@grundfos.com>
Date: Thu, 16 Nov 2017 08:22:31 +0100
Subject: [PATCH] Update git config_local

---
 .config/bash/aliases     |  2 +-
 .config/git/config       | 27 +++++++++------------------
 .config/git/config_local |  4 ++--
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/.config/bash/aliases b/.config/bash/aliases
index 31f64c8..8b37a4b 100644
--- a/.config/bash/aliases
+++ b/.config/bash/aliases
@@ -23,7 +23,7 @@ alias fgrep='fgrep --color=auto'
 if [ -e /usr/bin/vimx ]; then alias vim='/usr/bin/vimx'; fi
 
 # Shortcuts
-alias dot='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias g='git'
 alias h='history'
 alias j='jobs'
diff --git a/.config/git/config b/.config/git/config
index e167d4a..90b585b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -64,13 +64,10 @@
 	# List contributors with number of commits
 	contributors = shortlog --summary --numbered
 
-#	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
+	mydiff = difftool --dir-diff --tool=bc --no-prompt
 
 [help]
 	autocorrect = 10
@@ -86,35 +83,29 @@
 	default = simple
 [diff]
 	tool = vimdiff
+#	tool = bc
 [merge]
 	tool = vimdiff
+#	tool = bc
 [difftool "vimdiff"]
 	prompt = false
 	conflictstyle = diff3
 [mergetool "vimdiff"]
 	prompt = false
-#[diff]
-#	tool = bc
-#[merge]
-#	tool = bc
-#[difftool "bc"]
+[difftool "bc"]
 #	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
-#	trustExitCode = false
-#[mergetool "bc"]
+	trustExitCode = false
+[mergetool "bc"]
 #	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
-#	trustExitCode = false
+	trustExitCode = false
 [init]
 	templatedir = ~/.config/git/templates
 [core]
-#	excludesfile =
-#	attributesFile = ~/.config/git/attributes
 	editor = vim
-#	eol = native
-	autocrlf = true
-[include]
-	path = ~/.config/git/config_local
 [filter "lfs"]
 	clean = git-lfs clean -- %f
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+[include]
+	path = ~/.config/git/config_local
diff --git a/.config/git/config_local b/.config/git/config_local
index 9638d61..faa9497 100644
--- a/.config/git/config_local
+++ b/.config/git/config_local
@@ -1,6 +1,6 @@
 [user]
 	name = Jannik ZANDER
 	email = jzander@grundfos.com
-#[core]
-#	autocrlf = false
+[core]
+	autocrlf = true
 
-- 
2.43.0