From 3b7ac37b58909869f9ecd1d50f930c0ea6a37be7 Mon Sep 17 00:00:00 2001 From: NunzioFornitto Date: Wed, 29 Jul 2026 16:56:55 +0200 Subject: [PATCH] style(git): align verb tense in docs and fine-tune function order --- plugins/git/README.md | 2 +- plugins/git/git.plugin.zsh | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/plugins/git/README.md b/plugins/git/README.md index 704ddf404..53953fed5 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -253,7 +253,7 @@ receive further support. | `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_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 | | `gbcopy` | Copy current branch name to clipboard | | `grename ` | Renames branch `` to ``, including on the origin remote | | `gbda` | Deletes all merged branches | diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index a99ff4e28..f63725eb2 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -22,16 +22,7 @@ function git_develop_branch() { echo develop return 1 } -function gbcopy() { - # Check if we are in a Git repository - command git rev-parse --is-inside-work-tree &>/dev/null || return - local branch - branch="$(git_current_branch)" || return - [[ -n "$branch" ]] || return 1 - - print -rn -- "$branch" | clipcopy -} # Get the default branch name from common branch names or fallback to remote HEAD function git_main_branch() { @@ -59,6 +50,17 @@ function git_main_branch() { return 1 } +function gbcopy() { + # Check if we are in a Git repository + command git rev-parse --is-inside-work-tree &>/dev/null || return + + local branch + branch="$(git_current_branch)" || return + [[ -n "$branch" ]] || return 1 + + print -rn -- "$branch" | clipcopy +} + function grename() { if [[ -z "$1" || -z "$2" ]]; then echo "Usage: $0 old_branch new_branch"