diff options
| author | Soo Philip Jason Kim <philipjkim@gmail.com> | 2024-04-09 05:40:15 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 22:40:15 +0200 |
| commit | 3e2a5742cdb4deae4d7f10351d59c7f2933e3555 (patch) | |
| tree | f70f8f22431e1b9dff4d142dbe366806d192e077 /plugins | |
| parent | 982ea721bde90c1fca233419e2c5b6e90fd10225 (diff) | |
| download | zsh-3e2a5742cdb4deae4d7f10351d59c7f2933e3555.tar.gz zsh-3e2a5742cdb4deae4d7f10351d59c7f2933e3555.tar.bz2 zsh-3e2a5742cdb4deae4d7f10351d59c7f2933e3555.zip | |
feat(git): add alias `gmc` for `git merge --continue` (#12326)
Co-authored-by: PJ Kim <pj.0x08@kakaocorp.com>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/README.md | 1 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md index 181de37fc..4c005ad2f 100644 --- a/plugins/git/README.md +++ b/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)` | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 545ccc541..146f4a512 100644 --- a/plugins/git/git.plugin.zsh +++ b/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)' |