From 974f83401096b1dd32017f126352a4077d137954 Mon Sep 17 00:00:00 2001 From: Oskar Grunning Date: Thu, 21 Mar 2019 15:54:13 +0100 Subject: [PATCH] feat(git): add aliases for merge sign and verify Adds the following aliases: - gmS: GPG-sign the resulting merge commit. - gmV: Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted. --- modules/git/init.zsh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/git/init.zsh b/modules/git/init.zsh index 6141801..20f9e3c 100644 --- a/modules/git/init.zsh +++ b/modules/git/init.zsh @@ -106,6 +106,8 @@ alias glc='git shortlog --summary --numbered' alias gm='git merge' alias gmC='git merge --no-commit' alias gmF='git merge --no-ff' +alias gmS='git merge -S' +alias gmV='git merge --verify-signatures' alias gma='git merge --abort' alias gmt='git mergetool'