From d1d2ceba6bcd620c0c0717a92d565ab2e223a080 Mon Sep 17 00:00:00 2001 From: EinfachAleks Date: Fri, 3 Jun 2022 00:29:22 +0200 Subject: [PATCH] feat(git): add merge squash alias --- plugins/git/README.md | 1 + plugins/git/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/git/README.md b/plugins/git/README.md index b9af3488f..3597b7a99 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -113,6 +113,7 @@ plugins=(... git) | gmtl | git mergetool --no-prompt | | gmtlvim | git mergetool --no-prompt --tool=vimdiff | | gmum | git merge upstream/$(git_main_branch) | +| gms | git merge --squash | | gma | git merge --abort | | gp | git push | | gpd | git push --dry-run | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 8f7e623ec..3433528d2 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -231,6 +231,7 @@ alias gmtl='git mergetool --no-prompt' alias gmtlvim='git mergetool --no-prompt --tool=vimdiff' alias gmum='git merge upstream/$(git_main_branch)' alias gma='git merge --abort' +alias gms="git merge --squash" alias gp='git push' alias gpd='git push --dry-run'