summaryrefslogtreecommitdiff
path: root/dot-gitconfig
diff options
context:
space:
mode:
authorlittleblack111 <littleblack11111@gmail.com>2025-08-18 18:11:23 +0800
committerlittleblack111 <littleblack11111@gmail.com>2025-08-18 18:11:23 +0800
commit8d2d14ea202c4b185753fed65dfbfe951ec2b841 (patch)
tree655ba848ad4e3747727de7aa35ba609a7021e574 /dot-gitconfig
parent29840eef4f379c6a3489038a98eac507700f266f (diff)
config(dotfiles): update git and zsh configuration for user, shell, and environment
Diffstat (limited to 'dot-gitconfig')
-rw-r--r--dot-gitconfig2
1 files changed, 0 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