diff --git a/git/gitconfig b/git/gitconfig index 9afe3ee..56b2143 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -6,8 +6,6 @@ [gpg] format = ssh -[gpg "ssh"] - program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" [commit] gpgsign = true @@ -39,3 +37,6 @@ [push] autoSetupRemote = true + +[include] + path = ~/.gitconfig.local diff --git a/git/makefile b/git/makefile index 6aed267..26864b2 100644 --- a/git/makefile +++ b/git/makefile @@ -8,6 +8,7 @@ include ../lib/shared.mk init: $(report) header "Setting up gitconfig" $(mk_link) $(SOURCE) $(TARGET) + touch $(TARGET).local up: init