From ea3adabe0dc93a7e076494adad6ab39948c54b7a Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Sat, 8 Jun 2024 13:30:25 +0200 Subject: [PATCH] chore(gpg): update aliases and GPG keys --- fish/config.fish | 4 ++-- git/gitconfig | 1 - zsh/zshrc | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/fish/config.fish b/fish/config.fish index 130e5f1..6404a42 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -169,8 +169,8 @@ alias gg 'git log' alias ghi 'git hist' alias gl 'git pull' alias glr 'git pull --rebase' -alias glu 'git config user.name "Stefan Imhoff" && git config user.email "stefan@imhoff.name"' -alias glx 'git config user.name "Stefan Imhoff" && git config user.email "stefan.imhoff@xing.com"' +alias glu 'git config user.name "Stefan Imhoff" && git config user.email "gpg@kogakure.8shield.net" && git config user.signingkey "7A7253E8!"' +alias glx 'git config user.name "Stefan Imhoff" && git config user.email "stefan.imhoff@xing.com" && git config user.signingkey "73C3E2E3!"' alias gmb 'git merge-base master HEAD' alias gp 'git push' alias gpf 'git push --force-with-lease' diff --git a/git/gitconfig b/git/gitconfig index 3770639..bd39af5 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -1,6 +1,5 @@ [user] useConfigOnly = true - signingkey = F0CF1CF481C2E3AA0F806A378BD4525D7A7253E8! [include] path = ~/.gitconfig.local [help] diff --git a/zsh/zshrc b/zsh/zshrc index 5ad0f48..f4fbdc5 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -401,8 +401,8 @@ alias ghi='git hist' alias gho='$(git remote -v | grep github | sed -e "s/.*git\:\/\/\([a-z]\.\)*/\1/" -e "s/\.git$//g" -e "s/.*@\(.*\)$/\1/g" | tr ":" "/" | tr -d "\011" | sed -e "s/^/open http:\/\//g")' alias gl='git pull' alias glr='git pull --rebase' -alias glu='git config user.name "Stefan Imhoff" && git config user.email "stefan@imhoff.name";' -alias glx='git config user.name "Stefan Imhoff" && git config user.email "stefan.imhoff@xing.com";' +alias glu='git config user.name "Stefan Imhoff" && git config user.email "gpg@kogakure.8shield.net" && git config user.signingkey "7A7253E8!";' +alias glx='git config user.name "Stefan Imhoff" && git config user.email "stefan.imhoff@xing.com &&" && git config user.signingkey "73C3E2E3!";' alias gmb='git merge-base master HEAD' alias gp='git push' alias gpf='git push --force-with-lease'