psi-jack
/
zimfw
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

[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.

Closes #333
This commit is contained in:
Oskar Grunning 2019-03-21 15:54:13 +01:00 committed by Eric Nielsen
parent d2c1e613ae
commit dc6ef566af
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/git/README.md
View File

@ -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

4
modules/git/init.zsh
View File

@ -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)