From 8d2d14ea202c4b185753fed65dfbfe951ec2b841 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Mon, 18 Aug 2025 18:11:23 +0800 Subject: config(dotfiles): update git and zsh configuration for user, shell, and environment --- dot-gitconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'dot-gitconfig') 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 -- cgit v1.2.3