Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Ohmyzsh
Commits
83f61949
Commit
83f61949
authored
Jul 11, 2020
by
Marc Cornellà
Browse files
git: change docs for git_main_branch
Also remove unnecesary dramatic remark
parent
55a98fc0
Changes
2
Show whitespace changes
Inline
Side-by-side
plugins/git/README.md
View file @
83f61949
...
@@ -209,12 +209,12 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
...
@@ -209,12 +209,12 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
### Current
### Current
| Command | Description |
| Command | Description |
|:-----------------------|:-----------------------------------------------------------------------------|
|:-----------------------|:-----------------------------------------------------------------------------
----------
|
|
`grename <old> <new>`
| Rename
`old`
branch to
`new`
, including in origin remote |
|
`grename <old> <new>`
| Rename
`old`
branch to
`new`
, including in origin remote |
| current_branch | Return the name of the current branch |
| current_branch | Return the name of the current branch |
| git_current_user_name | Returns the
`user.name`
config value |
| git_current_user_name | Returns the
`user.name`
config value |
| git_current_user_email | Returns the
`user.email`
config value |
| git_current_user_email | Returns the
`user.email`
config value |
| git_main_branch | Returns the name of the main branch:
`master`
if it exists,
`main`
otherwise
|
| git_main_branch | Returns the name of the main branch:
from origin or from local branches, else 'master'
|
### Work in Progress (WIP)
### Work in Progress (WIP)
...
...
plugins/git/git.plugin.zsh
View file @
83f61949
...
@@ -25,8 +25,7 @@ function work_in_progress() {
...
@@ -25,8 +25,7 @@ function work_in_progress() {
fi
fi
}
}
# Get the default 'main' branch
# Get the default 'main' branch: from origin, from local branches, or else just 'master'
# Marc(2020-07-11): I hope to be able to remove this someday
function
git_main_branch
()
{
function
git_main_branch
()
{
# Get default branch from the origin remote
# Get default branch from the origin remote
local
branch
local
branch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment