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
Oh My Zsh
Commits
b9a989fe
Commit
b9a989fe
authored
Dec 07, 2012
by
MAD
Browse files
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
parent
6d7a2759
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/git.zsh
View file @
b9a989fe
...
...
@@ -85,6 +85,9 @@ git_prompt_status() {
elif
$(
echo
"
$INDEX
"
|
grep
'^AD '
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_DELETED$STATUS
"
fi
if
$(
git rev-parse
--verify
refs/stash
>
/dev/null 2>&1
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_STASHED$STATUS
"
fi
if
$(
echo
"
$INDEX
"
|
grep
'^UU '
&> /dev/null
)
;
then
STATUS
=
"
$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS
"
fi
...
...
@@ -102,7 +105,7 @@ git_prompt_status() {
#compare the provided version of git to the version installed and on path
#prints 1 if input version <= installed version
#prints -1 otherwise
#prints -1 otherwise
function
git_compare_version
()
{
local
INPUT_GIT_VERSION
=
$1
;
local
INSTALLED_GIT_VERSION
...
...
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