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

refactor(review): tweak verify alias and add docs

This commit is contained in:
Oskar Grunning 2019-03-22 08:44:50 +01:00
parent 974f834010
commit b2ea8408ac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/git/README.md
View File

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

4
modules/git/init.zsh
View File

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