diff --git a/modules/git/README.md b/modules/git/README.md index 8e820a7..11c904b 100644 --- a/modules/git/README.md +++ b/modules/git/README.md @@ -112,10 +112,13 @@ Aliases ### Merge * `gm` joins two or more development histories together. + * `gma` aborts the conflict resolution, and reconstructs the pre-merge state. * `gmC` performs the merge but does not commit. * `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 b66ed00..24ffd7b 100644 --- a/modules/git/init.zsh +++ b/modules/git/init.zsh @@ -108,9 +108,11 @@ alias ${gprefix}lr='git reflog' # Merge (m) alias ${gprefix}m='git merge' +alias ${gprefix}ma='git merge --abort' alias ${gprefix}mC='git merge --no-commit' alias ${gprefix}mF='git merge --no-ff' -alias ${gprefix}ma='git merge --abort' +alias ${gprefix}mS='git merge -S' +alias ${gprefix}mv='git merge --verify-signatures' alias ${gprefix}mt='git mergetool' # Push (p)