Remove git/config_local

diff --git a/.config/bash/environ b/.config/bash/environ
index 247db2794245c9e5fbc66b599013d54421e877e6..2e9aeb5f6f4704d3def1c87cbfbd3f77020eb74b 100644 (file)
--- 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 98b4f316c8477c0831577a437557e96e5a38fc43..5c72ca7c00c04a4cf449fda17ae32c9c76c75a42 100644 (file)
--- 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 (file)
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