From:  <jaz@N104828.emea.group.grundfos.com>
Date: Tue, 9 Jan 2018 10:45:09 +0000 (+0100)
Subject: Remove git/config_local
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=649bf25b5fb5ab412a1753ec018b85e52320beaa;p=dotfiles.git

Remove git/config_local
---

diff --git a/.config/bash/environ b/.config/bash/environ
index 247db27..2e9aeb5 100644
--- a/.config/bash/environ
+++ b/.config/bash/environ
@@ -6,8 +6,9 @@
 #fi;
 
 # Git completion and prompt
-source "/usr/share/git/completion/git-completion.bash"
-source "/usr/share/git/completion/git-prompt.sh"
+[ -f /usr/share/git/completion/git-completion.bash ] && . /usr/share/git/completion/git-completion.bash
+[ -f /usr/share/git/completion/git-prompt.sh ]       && . /usr/share/git/completion/git-prompt.sh
+
 export GIT_PS1_SHOWDIRTYSTATE=true
 export GIT_PS1_SHOWCOLORHINTS=true
 export GIT_PS1_UNTRACKEDFILES=true
diff --git a/.config/git/config b/.config/git/config
index 98b4f31..5c72ca7 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -93,10 +93,11 @@
 [mergetool "vimdiff"]
 	prompt = false
 [difftool "bc"]
-	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
+	path = bcompare
 	trustExitCode = false
 [mergetool "bc"]
-	path = C:\\Program Files\\Beyond Compare 4\\BComp.exe
+	path = bcompare
+	trustExitCode = false
 	trustExitCode = false
 [init]
 	templatedir = ~/.config/git/templates
diff --git a/.config/git/config_local b/.config/git/config_local
deleted file mode 100644
index cc524e0..0000000
--- a/.config/git/config_local
+++ /dev/null
@@ -1,5 +0,0 @@
-[user]
-	name = Jannik ZANDER
-	email = jzander@grundfos.com
-[core]
-	autocrlf = input