Merge branch 'master' of git.linux-help.org:psi-jack/my-yadm

2022-06-13 15:16:08 -04:00 · 2022-06-13 15:16:08 -04:00 · 880ea76474
parent 11e58a493f 2d697d69c2
commit 880ea76474
1 changed files with 1 additions and 1 deletions
--- a/.gitconfig##o.Darwin
+++ b/.gitconfig##o.Darwin
@ -20,4 +20,4 @@
    helper = osxkeychain
 [pull]
 	rebase = false
-	ff = no
+	ff = only