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
93ee9393
Commit
93ee9393
authored
Apr 22, 2013
by
Robby Russell
Browse files
Merge pull request #1745 from jtheoof/master
Added option to allow untracked files as non dirty
parents
5f32c8e1
e41714d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/git.zsh
View file @
93ee9393
...
@@ -15,7 +15,11 @@ parse_git_dirty() {
...
@@ -15,7 +15,11 @@ parse_git_dirty() {
if
[[
$POST_1_7_2_GIT
-gt
0
]]
;
then
if
[[
$POST_1_7_2_GIT
-gt
0
]]
;
then
SUBMODULE_SYNTAX
=
"--ignore-submodules=dirty"
SUBMODULE_SYNTAX
=
"--ignore-submodules=dirty"
fi
fi
GIT_STATUS
=
$(
git status
-s
${
SUBMODULE_SYNTAX
}
2> /dev/null |
tail
-n1
)
if
[[
"
$DISABLE_UNTRACKED_FILES_DIRTY
"
!=
"true"
]]
;
then
GIT_STATUS
=
$(
git status
-s
${
SUBMODULE_SYNTAX
}
2> /dev/null |
tail
-n1
)
else
GIT_STATUS
=
$(
git status
-s
${
SUBMODULE_SYNTAX
}
-uno
2> /dev/null |
tail
-n1
)
fi
if
[[
-n
$GIT_STATUS
&&
"
$GIT_STATUS
"
!=
"
$CLEAN_MESSAGE
"
]]
;
then
if
[[
-n
$GIT_STATUS
&&
"
$GIT_STATUS
"
!=
"
$CLEAN_MESSAGE
"
]]
;
then
echo
"
$ZSH_THEME_GIT_PROMPT_DIRTY
"
echo
"
$ZSH_THEME_GIT_PROMPT_DIRTY
"
else
else
...
...
templates/zshrc.zsh-template
View file @
93ee9393
...
@@ -29,6 +29,11 @@ ZSH_THEME="robbyrussell"
...
@@ -29,6 +29,11 @@ ZSH_THEME="robbyrussell"
# Uncomment following line if you want red dots to be displayed while waiting for completion
# Uncomment following line if you want red dots to be displayed while waiting for completion
# COMPLETION_WAITING_DOTS="true"
# COMPLETION_WAITING_DOTS="true"
# Uncomment following line if you want to disable marking untracked files under
# VCS as dirty. This makes repository status check for large repositories much,
# much faster.
# DISABLE_UNTRACKED_FILES_DIRTY="true"
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse)
# Example format: plugins=(rails git textmate ruby lighthouse)
...
...
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