summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dot-gitconfig2
-rw-r--r--dot-zshrc4
2 files changed, 4 insertions, 2 deletions
diff --git a/dot-gitconfig b/dot-gitconfig
index bb155222..9e6c6a73 100644
--- a/dot-gitconfig
+++ b/dot-gitconfig
@@ -10,8 +10,6 @@
gpgsign = true
[alias]
permission-reset = !git diff -p -R --no-ext-diff --no-color --diff-filter=M | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply
-[merge]
- ff = false
[credential "https://github.com"]
helper =
helper = !/usr/bin/gh auth git-credential
diff --git a/dot-zshrc b/dot-zshrc
index a8f7d9d3..1ab9639d 100644
--- a/dot-zshrc
+++ b/dot-zshrc
@@ -142,3 +142,7 @@ precmd() {
# cd $@ && echo $@ > $HOME/.cache/prev.dir
# }
#
+
+fpath+=~/.zfunc; autoload -Uz compinit; compinit
+
+zstyle ':completion:*' menu select