diff --git a/modules/git/README.md b/modules/git/README.md index 9c0abc7..28bbf34 100644 --- a/modules/git/README.md +++ b/modules/git/README.md @@ -112,9 +112,12 @@ Aliases * `gm` joins two or more development histories together. * `gmC` performs the merge but does not commit. - * `gmF` performs the merge generating a commit even if the merge resolved as a - fast-forward. + * `gmF` performs the merge generating a commit even if the merge resolved as + a fast-forward. * `gma` aborts the conflict resolution, and reconstructs the pre-merge state. + * `gmS` commits with GPG signature. + * `gmv` verifies the GPG signature of the tip commit of the side branch being + merged. * `gmt` runs the merge conflict resolution tools to resolve conflicts. ### Push diff --git a/modules/git/init.zsh b/modules/git/init.zsh index 20f9e3c..96ab06b 100644 --- a/modules/git/init.zsh +++ b/modules/git/init.zsh @@ -104,11 +104,11 @@ alias glc='git shortlog --summary --numbered' # Merge (m) alias gm='git merge' +alias gma='git merge --abort' 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 gmv='git merge --verify-signatures' alias gmt='git mergetool' # Push (p)