diff options
| author | Arvin Verain <arvinverain@proton.me> | 2025-12-19 17:05:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-19 10:05:49 +0100 |
| commit | 95de26572e6790ea178193580c625c9109119176 (patch) | |
| tree | 0faed33d2e5b65975b3b6836c3a7a484e2edbd30 | |
| parent | 945d89f7ae86c740f0e09e94b7baf9b12a384535 (diff) | |
| download | zsh-95de26572e6790ea178193580c625c9109119176.tar.gz zsh-95de26572e6790ea178193580c625c9109119176.tar.bz2 zsh-95de26572e6790ea178193580c625c9109119176.zip | |
revert(git): revert deprecation for `gg*` aliases (#13485)
These aliases have long been expected and integrated with user workflows. Reverting our decision to deprecate them.
| -rw-r--r-- | plugins/git/README.md | 3 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md index bbbb28bdf..0090fa6cf 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -239,9 +239,6 @@ receive further support. | `gap` | `git add --patch` | New alias: `gapa` | | `gcl` | `git config --list` | New alias: `gcf` | | `gdt` | `git difftool` | No replacement | -| `ggpull` | `git pull origin $(git_current_branch)` | New function: `ggl` (`ggpull` is now aliased to this) | -| `ggpur` | `git pull --rebase origin $(git_current_branch)` | New function: `ggu` (`ggpur` is now aliased to this) | -| `ggpush` | `git push origin $(git_current_branch)` | New function: `ggp` (`ggpush` is now aliased to this) | ## Functions diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index a240e1fb3..9ef60d69a 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -102,6 +102,7 @@ function ggpnp() { } compdef _git ggpnp=git-checkout +alias ggpur='ggu' alias g='git' alias ga='git add' alias gaa='git add --all' @@ -281,6 +282,7 @@ alias gprom='git pull --rebase origin $(git_main_branch)' alias gpromi='git pull --rebase=interactive origin $(git_main_branch)' alias gprum='git pull --rebase upstream $(git_main_branch)' alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)' +alias ggpull='git pull origin "$(git_current_branch)"' function ggl() { if [[ $# != 0 ]] && [[ $# != 1 ]]; then @@ -324,6 +326,7 @@ is-at-least 2.30 "$git_version" \ alias gpv='git push --verbose' alias gpoat='git push origin --all && git push origin --tags' alias gpod='git push origin --delete' +alias ggpush='git push origin "$(git_current_branch)"' function ggp() { if [[ $# != 0 ]] && [[ $# != 1 ]]; then @@ -420,9 +423,6 @@ unset git_version local old_name new_name for old_name new_name ( current_branch git_current_branch - ggpull ggl - ggpur ggu - ggpush ggp ); do aliases[$old_name]=" print -Pu2 \"%F{yellow}[oh-my-zsh] '%F{red}${old_name}%F{yellow}' is deprecated, using '%F{green}${new_name}%F{yellow}' instead.%f\" |