diff options
Diffstat (limited to 'dot-gitconfig')
| -rw-r--r-- | dot-gitconfig | 2 |
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 |