mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-22 22:00:08 +00:00
Merge pull request #2099 from mchaisse/master
Added WIP (work in progress) feature to git.plugin
This commit is contained in:
commit
a712579a2a
2 changed files with 16 additions and 2 deletions
|
@ -129,3 +129,17 @@ function _git_log_prettily(){
|
||||||
}
|
}
|
||||||
alias glp="_git_log_prettily"
|
alias glp="_git_log_prettily"
|
||||||
compdef _git glp=git-log
|
compdef _git glp=git-log
|
||||||
|
|
||||||
|
# Work In Progress (wip)
|
||||||
|
# These features allow to pause a branch development and switch to another one (wip)
|
||||||
|
# When you want to go back to work, just unwip it
|
||||||
|
#
|
||||||
|
# This function return a warning if the current branch is a wip
|
||||||
|
function work_in_progress() {
|
||||||
|
if $(git log -n 1 | grep -q -c wip); then
|
||||||
|
echo "WIP!!"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
# these alias commit and uncomit wip branches
|
||||||
|
alias gwip='git add -A; git ls-files --deleted -z | xargs -0 git rm; git commit -m "wip"'
|
||||||
|
alias gunwip='git log -n 1 | grep -q -c wip && git reset HEAD~1'
|
||||||
|
|
|
@ -7,7 +7,7 @@ ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
git_custom_status() {
|
git_custom_status() {
|
||||||
local cb=$(current_branch)
|
local cb=$(current_branch)
|
||||||
if [ -n "$cb" ]; then
|
if [ -n "$cb" ]; then
|
||||||
echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue