chore: small tweaks for work comp

This commit is contained in:
Ted Kulp
2023-10-23 08:27:07 -04:00
parent c5bef9dc4d
commit b3048ab852
3 changed files with 36 additions and 19 deletions

View File

@@ -1,17 +0,0 @@
[user]
name = Ted Kulp
email = ted@tedkulp.com
gmail = tedkulp@gmail.com
signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895
[commit]
# gpgsign = true
[credential]
helper = osxkeychain
[pull]
rebase = false
[tag]
forceSignAnnotated = true
[alias]
mdr = merge --no-commit --no-ff
[init]
defaultBranch = main

36
.gitconfig##template Normal file
View File

@@ -0,0 +1,36 @@
[user]
name = Ted Kulp
{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
email = ted@allocate.co
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsv4Cz+g1q93ifvEhSyMgE6mWiKacoLRKyHgWC7Vey7
{% else %}
email = ted@tedkulp.com
gmail = tedkulp@gmail.com
signingKey = AE6B007E2FAB1C94319C7C09FD56BE79CDAE7895
{% endif %}
{% if yadm.hostname == "ALLOCATE-Y3HW9MWW2D" %}
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
{% endif %}
[commit]
gpgsign = true
[credential]
helper = osxkeychain
[pull]
rebase = false
[tag]
forceSignAnnotated = true
[alias]
mdr = merge --no-commit --no-ff
[init]
defaultBranch = main

View File

@@ -1,2 +0,0 @@
Host *
IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"