Browse Source

feat(git): add alias `gmc` for `git merge --continue` (#12326)

Co-authored-by: PJ Kim <pj.0x08@kakaocorp.com>
Soo Philip Jason Kim 3 weeks ago
parent
commit
3e2a5742cd
2 changed files with 2 additions and 0 deletions
  1. 1 0
      plugins/git/README.md
  2. 1 0
      plugins/git/git.plugin.zsh

+ 1 - 0
plugins/git/README.md

@@ -111,6 +111,7 @@ plugins=(... git)
 | `gfg`                  | `git ls-files \| grep`                                                                                                          |
 | `gm`                   | `git merge`                                                                                                                     |
 | `gma`                  | `git merge --abort`                                                                                                             |
+| `gmc`                  | `git merge --continue`                                                                                                             |
 | `gms`                  | `git merge --squash`                                                                                                            |
 | `gmom`                 | `git merge origin/$(git_main_branch)`                                                                                           |
 | `gmum`                 | `git merge upstream/$(git_main_branch)`                                                                                         |

+ 1 - 0
plugins/git/git.plugin.zsh

@@ -252,6 +252,7 @@ alias gignored='git ls-files -v | grep "^[[:lower:]]"'
 alias gfg='git ls-files | grep'
 alias gm='git merge'
 alias gma='git merge --abort'
+alias gmc='git merge --continue'
 alias gms="git merge --squash"
 alias gmom='git merge origin/$(git_main_branch)'
 alias gmum='git merge upstream/$(git_main_branch)'