Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
51772732
Unverified
Commit
51772732
authored
Nov 12, 2020
by
Alisson B. Santos
Committed by
GitHub
Nov 12, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(git): support trunk branches in `git_main_branch` (#9417)
parent
874d83f7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
git.plugin.zsh
plugins/git/git.plugin.zsh
+8
-5
No files found.
plugins/git/git.plugin.zsh
View file @
51772732
...
...
@@ -31,11 +31,14 @@ 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
echo
master
fi
local
branch
for
branch
in
main trunk
;
do
if
command
git show-ref
-q
--verify
refs/heads/
$branch
;
then
echo
$branch
return
fi
done
echo
master
}
#
...
...
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