3e2a5742cdb4deae4d7f10351d59c7f2933e3555
- Author
- Soo Philip Jason Kim <philipjkim@gmail.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
feat(git): add alias `gmc` for `git merge --continue` (#12326)
Co-authored-by: PJ Kim <pj.0x08@kakaocorp.com>
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 181de37fcb354f6edc8692a2e4bded0d889145d8..4c005ad2f91a4c03f837046f98436d5dfd53ec8e 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -111,6 +111,7 @@ plugins=(... git)
6 | `gfg` | `git ls-files \| grep` |
7 | `gm` | `git merge` |
8 | `gma` | `git merge --abort` |
9+| `gmc` | `git merge --continue` |
10 | `gms` | `git merge --squash` |
11 | `gmom` | `git merge origin/$(git_main_branch)` |
12 | `gmum` | `git merge upstream/$(git_main_branch)` |
13diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
14index 545ccc541eab8641e30f28ee7a60ebf878ba0b6c..146f4a512504fb8394b6ada4e80dd550f8bc2b90 100644
15--- a/plugins/git/git.plugin.zsh
16+++ b/plugins/git/git.plugin.zsh
17@@ -252,6 +252,7 @@ alias gignored='git ls-files -v | grep "^[[:lower:]]"'
18 alias gfg='git ls-files | grep'
19 alias gm='git merge'
20 alias gma='git merge --abort'
21+alias gmc='git merge --continue'
22 alias gms="git merge --squash"
23 alias gmom='git merge origin/$(git_main_branch)'
24 alias gmum='git merge upstream/$(git_main_branch)'