.gitconfig

@@ -4,7 +4,6 @@
 [merge]
 	tool = meld
 	conflictStyle = zdiff3
-	keepbackup = false
 
 [alias]
 	plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches
@@ -28,7 +27,6 @@
 	smtpServerPort = 587
 [diff]
 	wsErrorHighlight = all
-	algorithm = histogram
 [cola]
 	spellcheck = false
 [push]
@@ -60,9 +58,3 @@
 	allow = always
 [column]
 	ui = auto
-[rebase]
-	autosquash = true
-[branch]
-	sort = -committerdate
-[fetch]
-	prune = true

.zshrc

@@ -251,27 +251,19 @@ else
     ruby_gem_user_dir=''
 fi
 
-# kubectl plugin manager Krew
-export KREW_ROOT="~/.config/krew"
-if [[ -d "${KREW_ROOT}/bin" ]]; then
-    krew_bin_path="${KREW_ROOT}/bin"
-else
-    krew_bin_path=''
-fi
-
-
 # ZSH allows $PATH to be used as an array
 path=(
     ~/.bin
     ~/.local/bin
-    ${ruby_gem_user_dir}
-    ${krew_bin_path}
     /usr/bin/site_perl
     /usr/bin/vendor_perl
     /usr/bin/core_perl
+    "${ruby_gem_user_dir}"
     $path
 )
 
+export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
+
 HISTSIZE=100000
 SAVEHIST=100000