*
j3s j3s@c3f.net
Wed, 16 Dec 2020 13:22:01 -0600
1 files changed,
5 insertions(+),
1 deletions(-)
jump to
M
.config/git/config
→
.config/git/config
@@ -34,8 +34,12 @@ [sendemail]
smtpserver = smtp.migadu.com smtpuser = j3s@c3f.net smtpencryption = tls - smtpserverport = 587 + smtpserverport = 465 annotate = yes +[merge] + ff = false +[pull] + ff = only [includeIf "gitdir:~/git/"] path = ~/.config/git/config-work [includeIf "gitdir:~/howdocs/"]