ylib/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-22 15:36:24 +08:00
Code Projects Releases Wiki Activity

git: use master if it exists, otherwise use main

Browse Source 
See https://github.com/ohmyzsh/ohmyzsh/pull/9049#issuecomment-654537347

Co-authored-by: Yufan You <ouuansteve@gmail.com>
This commit is contained in:
Marc Cornellà 2020-07-09 11:16:16 +02:00
parent d79941b789
commit 1db79f97f5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/git/README.md
View File

@ -183,8 +183,8 @@ plugins=(... git)
Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
function `git_main_branch`.
that any aliases and functions that previously used `master`, will use `main` if `master` doesn't exist. We do this via
the function `git_main_branch`.
### Deprecated aliases
@ -214,7 +214,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
| current_branch | Return the name of the current branch |
| git_current_user_name | Returns the `user.name` config value |
| git_current_user_email | Returns the `user.email` config value |
| 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: `master` if it exists, `main` otherwise |
### Work in Progress (WIP)

6
plugins/git/git.plugin.zsh
View File

@ -27,10 +27,10 @@ function work_in_progress() {
# Check if main exists and use instead of master
function git_main_branch() {
if [[ -n "$(git branch --list main)" ]]; then
echo main
else
if [[ -n "$(git branch --list master)" ]]; then
echo master
else
echo main
fi
}