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
9df79bc2
Commit
9df79bc2
authored
Jan 13, 2016
by
Marc Cornellà
Browse files
Merge pull request #4773 from mbologna/patch-1
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
parents
686e4602
87f82513
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/git.zsh
View file @
9df79bc2
...
...
@@ -37,7 +37,9 @@ function git_remote_status() {
ahead
=
$(
command
git rev-list
${
hook_com
[branch]
}
@
{
upstream
}
..HEAD 2>/dev/null |
wc
-l
)
behind
=
$(
command
git rev-list HEAD..
${
hook_com
[branch]
}
@
{
upstream
}
2>/dev/null |
wc
-l
)
if
[[
$ahead
-gt
0
]]
&&
[[
$behind
-eq
0
]]
;
then
if
[[
$ahead
-eq
0
]]
&&
[[
$behind
-eq
0
]]
;
then
git_remote_status
=
"
$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
"
elif
[[
$ahead
-gt
0
]]
&&
[[
$behind
-eq
0
]]
;
then
git_remote_status
=
"
$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE
"
git_remote_status_detailed
=
"
$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE
$((
ahead
))
%{
$reset_color
%}"
elif
[[
$behind
-gt
0
]]
&&
[[
$ahead
-eq
0
]]
;
then
...
...
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