linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(git): add merge squash alias

Browse source
This commit is contained in:
EinfachAleks 2022-06-03 00:29:22 +02:00
commit d1d2ceba6b
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/git/README.md
View file

@ -113,6 +113,7 @@ plugins=(... git)
| gmtl | git mergetool --no-prompt | | gmtl | git mergetool --no-prompt |
| gmtlvim | git mergetool --no-prompt --tool=vimdiff | | gmtlvim | git mergetool --no-prompt --tool=vimdiff |
| gmum | git merge upstream/$(git_main_branch) | | gmum | git merge upstream/$(git_main_branch) |
| gms | git merge --squash |
| gma | git merge --abort | | gma | git merge --abort |
| gp | git push | | gp | git push |
| gpd | git push --dry-run | | gpd | git push --dry-run |

1
plugins/git/git.plugin.zsh
View file

@ -231,6 +231,7 @@ alias gmtl='git mergetool --no-prompt'
alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
alias gmum='git merge upstream/$(git_main_branch)' alias gmum='git merge upstream/$(git_main_branch)'
alias gma='git merge --abort' alias gma='git merge --abort'
alias gms="git merge --squash"
alias gp='git push' alias gp='git push'
alias gpd='git push --dry-run' alias gpd='git push --dry-run'