Update git config_local

diff --git a/.config/bash/aliases b/.config/bash/aliases
index 31f64c80d606d4b3de4c0c3c3eefd49b310c1454..8b37a4b4dfd0d1aa2e33acf358cda3fd32bcea14 100644 (file)
--- 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 e167d4a8d7e6ae0de658f91fcb0859101cb687ac..90b585ba5417f6c226e246f8fdeed92dc5411389 100644 (file)
--- 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 9638d610e278897d492fd5ef74172d03e7c7c80f..faa949754bc899b4074d5fa7d72f1bf654520158 100644 (file)
--- 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