ad99f0c164111fa3cfcbfc5b9cda321800541936
- Author
- Aleks <aleks@einfach-aleks.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
feat(git): add merge squash alias (`gms`) (#10937)
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 0895ce39cdd0dc7a82717b27e58d7a7f9568e3a3..f87d3fbca0756de16a79ad915ef8c26783bdbd96 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -116,6 +116,7 @@ plugins=(... git)
6 | gloga | git log --oneline --decorate --graph --all |
7 | glp | git log --pretty=\<format\> |
8 | gm | git merge |
9+| gms | git merge --squash |
10 | gmom | git merge origin/$(git_main_branch) |
11 | gmtl | git mergetool --no-prompt |
12 | gmtlvim | git mergetool --no-prompt --tool=vimdiff |
13diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
14index ed17436e8ec5d92d5b21f61b81d2cac885a0a230..3c8d53c8c6a58bd580f881f960dfd1da14f96d79 100644
15--- a/plugins/git/git.plugin.zsh
16+++ b/plugins/git/git.plugin.zsh
17@@ -237,6 +237,7 @@ alias gmtl='git mergetool --no-prompt'
18 alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
19 alias gmum='git merge upstream/$(git_main_branch)'
20 alias gma='git merge --abort'
21+alias gms="git merge --squash"
22
23 alias gp='git push'
24 alias gpd='git push --dry-run'