linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 2cd1323e0a into 220eccf0a9

Browse source
This commit is contained in:
GitHub Merge Button 2011-12-14 22:04:04 -08:00
commit c3b4886016
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/git.zsh
View file

@ -30,6 +30,13 @@ function git_prompt_long_sha() {
SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" SHA=$(git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
} }
# Checks if there are stashed changes
function git_prompt_stash() {
if [[ -n $(git stash list 2> /dev/null) ]]; then
echo "$ZSH_THEME_GIT_PROMPT_STASH"
fi
}
# Get the status of the working tree # Get the status of the working tree
git_prompt_status() { git_prompt_status() {
INDEX=$(git status --porcelain 2> /dev/null) INDEX=$(git status --porcelain 2> /dev/null)

4
plugins/autojump/autojump.plugin.zsh
View file

@ -1,3 +1,5 @@
if [ -f `brew --prefix`/etc/autojump ]; then if [ -e /etc/profile.d/autojump.zsh ]; then
. /etc/profile.d/autojump.zsh
elif [ -f `brew --prefix`/etc/autojump ]; then
. `brew --prefix`/etc/autojump . `brew --prefix`/etc/autojump
fi fi