Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fishfix #346

Merged
merged 2 commits into from
Aug 30, 2017
Merged

Fishfix #346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0bdc7d
Make __GIT_PROMPT_DIR value consistent with default installation path.
prograwertyk Aug 29, 2017
9c82bed
Fix fish_prompt function.
prograwertyk Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 36 additions & 36 deletions gitprompt.fish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
# name: bash-git-prompt
# author: Mariusz Smykuła <mariuszs@gmail.com>

if not set -q __GIT_PROMPT_DIR
set __GIT_PROMPT_DIR ~/.gitprompt
end
function fish_prompt

# Colors
# Reset
set ResetColor (set_color normal) # Text Reset

# Regular Colors
set Red (set_color red) # Red
set Yellow (set_color yellow); # Yellow
set Blue (set_color blue) # Blue
set WHITE (set_color white)

# Bold
set BGreen (set_color -o green) # Green

# High Intensty
set IBlack (set_color -o black) # Black

# Bold High Intensty
set Magenta (set_color -o purple) # Purple

# Default values for the appearance of the prompt. Configure at will.
set GIT_PROMPT_PREFIX "["
set GIT_PROMPT_SUFFIX "]"
set GIT_PROMPT_SEPARATOR "|"
set GIT_PROMPT_BRANCH "$Magenta"
set GIT_PROMPT_STAGED "$Red● "
set GIT_PROMPT_CONFLICTS "$Red✖ "
set GIT_PROMPT_CHANGED "$Blue✚ "
set GIT_PROMPT_REMOTE " "
set GIT_PROMPT_UNTRACKED "…"
set GIT_PROMPT_STASHED "⚑ "
set GIT_PROMPT_CLEAN "$BGreen✔"
if not set -q __GIT_PROMPT_DIR
set __GIT_PROMPT_DIR ~/.bash-git-prompt
end

function fish_prompt
# Colors
# Reset
set ResetColor (set_color normal) # Text Reset

# Regular Colors
set Red (set_color red) # Red
set Yellow (set_color yellow); # Yellow
set Blue (set_color blue) # Blue
set WHITE (set_color white)

# Bold
set BGreen (set_color -o green) # Green

# High Intensty
set IBlack (set_color -o black) # Black

# Bold High Intensty
set Magenta (set_color -o purple) # Purple

# Default values for the appearance of the prompt. Configure at will.
set GIT_PROMPT_PREFIX "["
set GIT_PROMPT_SUFFIX "]"
set GIT_PROMPT_SEPARATOR "|"
set GIT_PROMPT_BRANCH "$Magenta"
set GIT_PROMPT_STAGED "$Red● "
set GIT_PROMPT_CONFLICTS "$Red✖ "
set GIT_PROMPT_CHANGED "$Blue✚ "
set GIT_PROMPT_REMOTE " "
set GIT_PROMPT_UNTRACKED "…"
set GIT_PROMPT_STASHED "⚑ "
set GIT_PROMPT_CLEAN "$BGreen✔"

# Various variables you might want for your PS1 prompt instead
set Time (date +%R)
Expand Down Expand Up @@ -92,7 +92,7 @@ function fish_prompt
if [ "$GIT_UNTRACKED" != "0" ]
set STATUS "$STATUS$GIT_PROMPT_UNTRACKED$GIT_UNTRACKED$ResetColor"
end

if [ "$GIT_STASHED" != "0" ]
set STATUS "$STATUS$GIT_PROMPT_STASHED$GIT_STASHED$ResetColor"
end
Expand Down