Archives/oh-my-fish_theme-bobthefish
1
0
Fork 0
mirror of https://github.com/oh-my-fish/theme-bobthefish.git synced 2025-06-13 13:03:54 +00:00
Code Issues Projects Releases Wiki Activity

Make main behave like master branch

Browse Source
This commit is contained in:
Darren Kidd 2020-10-13 17:13:04 +13:00
parent df1333899d
commit 6e3ef61aa9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -108,6 +108,11 @@ set -g theme_project_dir_length 1
set -g theme_newline_cursor yes set -g theme_newline_cursor yes
set -g theme_newline_prompt '$ ' set -g theme_newline_prompt '$ '
``` ```
**GIT options**
Note that `master` and `main` now behave in the same way i.e. they
are hidden/collapsed by default. Set the `theme_display_git_master_branch`
override to `yes` (see above) to see these branches.
**Title options** **Title options**

2
fish_prompt.fish
View File

@ -78,7 +78,7 @@ end
function __bobthefish_git_branch -S -d 'Get the current git branch (or commitish)' function __bobthefish_git_branch -S -d 'Get the current git branch (or commitish)'
set -l ref (command git symbolic-ref HEAD 2>/dev/null) set -l ref (command git symbolic-ref HEAD 2>/dev/null)
and begin and begin
[ "$theme_display_git_master_branch" != 'yes' -a "$ref" = 'refs/heads/master' ] [ "$theme_display_git_master_branch" != 'yes' -a \( "$ref" = 'refs/heads/master' -o "$ref" = 'refs/heads/main' \) ]
and echo $branch_glyph and echo $branch_glyph
and return and return