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

This commit is contained in:
Eric Renfro 2022-06-13 15:16:08 -04:00
commit e2ff9a2f99
1 changed files with 1 additions and 1 deletions

View File

@ -20,4 +20,4 @@
helper = osxkeychain
[pull]
rebase = false
ff = no
ff = only