Skip to content

O
oh-my-zsh
Unverified Commit ad99f0c1 authored by Aleks's avatar Aleks Committed by GitHub
Browse files
Options

feat(git): add merge squash alias (`gms`) (#10937)

parent e906a313
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
plugins/git/README.md
View file @ ad99f0c1
...@@ -116,6 +116,7 @@ plugins=(... git) ...@@ -116,6 +116,7 @@ plugins=(... git)
| gloga | git log --oneline --decorate --graph --all | | gloga | git log --oneline --decorate --graph --all |
| glp | git log --pretty=\<format\> | | glp | git log --pretty=\<format\> |
| gm | git merge | | gm | git merge |
| gms | git merge --squash |
| gmom | git merge origin/$(git_main_branch) | | gmom | git merge origin/$(git_main_branch) |
| gmtl | git mergetool --no-prompt | | gmtl | git mergetool --no-prompt |
| gmtlvim | git mergetool --no-prompt --tool=vimdiff | | gmtlvim | git mergetool --no-prompt --tool=vimdiff |
......
plugins/git/git.plugin.zsh
View file @ ad99f0c1
...@@ -237,6 +237,7 @@ alias gmtl='git mergetool --no-prompt' ...@@ -237,6 +237,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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment