linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-05 01:46:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f2b4d443af into e9fc134236

Browse source
This commit is contained in:
Arvin Verain 2025-12-02 03:30:09 +00:00 • committed by GitHub
commit 65bb20bf4e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

48
plugins/git/README.md
View file

@ -234,40 +234,29 @@ branch exists. We do this via the function `git_main_branch`.
These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not,
receive further support. receive further support.
| Alias | Command | Modification | | Alias | Command | Modification |
| :------- | :-------------------------------------------------------- | :-------------------------------------------------------- | | :------- | :-------------------------------------------------------- | :-----------------------------------------------------|
| `gap` | `git add --patch` | New alias: `gapa`. | | `gap` | `git add --patch` | New alias: `gapa` |
| `gcl` | `git config --list` | New alias: `gcf`. | | `gcl` | `git config --list` | New alias: `gcf` |
| `gdc` | `git diff --cached` | New alias: `gdca`. | | `gdt` | `git difftool` | No replacement |
| `gdt` | `git difftool` | No replacement. | | `ggpull` | `git pull origin $(git_current_branch)` | New function: `ggl` (`ggpull` is now aliased to this) |
| `ggpull` | `git pull origin $(current_branch)` | New alias: `ggl`. (`ggpull` still exists for now though.) | | `ggpur` | `git pull --rebase origin $(git_current_branch)` | New function: `ggu` (`ggpur` is now aliased to this) |
| `ggpur` | `git pull --rebase origin $(current_branch)` | New alias: `ggu`. (`ggpur` still exists for now though.) | | `ggpush` | `git push origin $(git_current_branch)` | New function: `ggp` (`ggpush` is now aliased to this) |
| `ggpush` | `git push origin $(current_branch)` | New alias: `ggp`. (`ggpush` still exists for now though.) |
| `gk` | `gitk --all --branches` | Now aliased to `gitk --all --branches`. |
| `glg` | `git log --stat --max-count=10` | Now aliased to `git log --stat --color`. |
| `glgg` | `git log --graph --max-count=10` | Now aliased to `git log --graph --color`. |
| `gwc` | `git whatchanged -p --abbrev-commit --pretty = medium` | New alias: `gwch`. |
| `gup` | `git pull --rebase` | now alias `gpr` |
| `gupv` | `git pull --rebase -v` | now alias `gprv` |
| `gupa` | `git pull --rebase --autostash` | now alias `gpra` |
| `gupav` | `git pull --rebase --autostash -v` | now alias `gprav` |
| `gupom` | `git pull --rebase origin $(git_main_branch)` | now alias `gprom` |
| `gupomi` | `git pull --rebase=interactive origin $(git_main_branch)` | now alias `gpromi` |
## Functions ## Functions
### Current ### Current
| Command | Description | | Command | Description |
| :----------------------- | :-------------------------------------------------------------------------------------------------------------- | | :----------------------- | :------------------------------------------------------------------------------------------------------------- |
| `current_branch` | Returns the name of the current branch. | | `git_current_branch` | Returns the name of the current branch (Lives in `lib/git.zsh`) |
| `git_current_user_email` | Returns the `user.email` config value. (Lives in `lib/git.zsh`.) | | `git_current_user_email` | Returns the `user.email` config value (Lives in `lib/git.zsh`) |
| `git_current_user_name` | Returns the `user.name` config value. (Lives in `lib/git.zsh`.) | | `git_current_user_name` | Returns the `user.name` config value (Lives in `lib/git.zsh`) |
| `git_develop_branch` | Returns the name of the “development” branch: `dev`, `devel`, `development` if they exist, `develop` otherwise. | | `git_develop_branch` | Returns the name of the “development” branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
| `git_main_branch` | Returns the name of the main branch: `main` if it exists, `master` otherwise. | | `git_main_branch` | Returns the name of the main branch: `main` if it exists, `master` otherwise |
| `grename <old> <new>` | Renames branch `<old>` to `<new>`, including on the origin remote. | | `grename <old> <new>` | Renames branch `<old>` to `<new>`, including on the origin remote |
| `gbda` | Deletes all merged branches | | `gbda` | Deletes all merged branches |
| `gbds` | Deletes all squash-merged branches (**Note: performance degrades with number of branches**) | | `gbds` | Deletes all squash-merged branches (**Note: performance degrades with number of branches**) |
### Work in Progress (WIP) ### Work in Progress (WIP)
@ -287,4 +276,3 @@ Note that `gwip` and `gunwip` are aliases, but are also documented here to group
| Command | Description | Reason | | Command | Description | Reason |
| :------------------- | :-------------------------------------- | :--------------------------------------------------------------- | | :------------------- | :-------------------------------------- | :--------------------------------------------------------------- |
| `current_repository` | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias). |

36
plugins/git/git.plugin.zsh
View file

@ -8,14 +8,6 @@ git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
# (order should follow README) # (order should follow README)
# #
# The name of the current branch
# Back-compatibility wrapper for when this function was defined here in
# the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
# to fix the core -> git plugin dependency.
function current_branch() {
git_current_branch
}
# Check for develop and similarly named branches # Check for develop and similarly named branches
function git_develop_branch() { function git_develop_branch() {
command git rev-parse --git-dir &>/dev/null || return command git rev-parse --git-dir &>/dev/null || return
@ -110,7 +102,6 @@ function ggpnp() {
} }
compdef _git ggpnp=git-checkout compdef _git ggpnp=git-checkout
alias ggpur='ggu'
alias g='git' alias g='git'
alias ga='git add' alias ga='git add'
alias gaa='git add --all' alias gaa='git add --all'
@ -290,7 +281,6 @@ alias gprom='git pull --rebase origin $(git_main_branch)'
alias gpromi='git pull --rebase=interactive origin $(git_main_branch)' alias gpromi='git pull --rebase=interactive origin $(git_main_branch)'
alias gprum='git pull --rebase upstream $(git_main_branch)' alias gprum='git pull --rebase upstream $(git_main_branch)'
alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)' alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)'
alias ggpull='git pull origin "$(git_current_branch)"'
function ggl() { function ggl() {
if [[ $# != 0 ]] && [[ $# != 1 ]]; then if [[ $# != 0 ]] && [[ $# != 1 ]]; then
@ -334,7 +324,6 @@ is-at-least 2.30 "$git_version" \
alias gpv='git push --verbose' alias gpv='git push --verbose'
alias gpoat='git push origin --all && git push origin --tags' alias gpoat='git push origin --all && git push origin --tags'
alias gpod='git push origin --delete' alias gpod='git push origin --delete'
alias ggpush='git push origin "$(git_current_branch)"'
function ggp() { function ggp() {
if [[ $# != 0 ]] && [[ $# != 1 ]]; then if [[ $# != 0 ]] && [[ $# != 1 ]]; then
@ -427,19 +416,16 @@ alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
unset git_version unset git_version
# Logic for adding warnings on deprecated aliases # Logic for adding warnings on deprecated aliases or functions
local old_alias new_alias local old_name new_name
for old_alias new_alias ( for old_name new_name (
# TODO(2023-10-19): remove deprecated `git pull --rebase` aliases current_branch git_current_branch
gup gpr ggpull ggl
gupv gprv ggpur ggu
gupa gpra ggpush ggp
gupav gprav
gupom gprom
gupomi gpromi
); do ); do
aliases[$old_alias]=" aliases[$old_name]="
print -Pu2 \"%F{yellow}[oh-my-zsh] '%F{red}${old_alias}%F{yellow}' is a deprecated alias, using '%F{green}${new_alias}%F{yellow}' instead.%f\" print -Pu2 \"%F{yellow}[oh-my-zsh] '%F{red}${old_name}%F{yellow}' is deprecated, using '%F{green}${new_name}%F{yellow}' instead.%f\"
$new_alias" $new_name"
done done
unset old_alias new_alias unset old_name new_name