diff options
| author | Robby Russell <robby@planetargon.com> | 2013-09-18 23:38:11 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-09-18 23:38:11 -0700 |
| commit | a712579a2a77dfc6a7a3fe258141e652b42765fb (patch) | |
| tree | 1aaa7543624b7f6b5d157aef1ca6717de3dcb061 | |
| parent | ac58ffdf6623dd703c341881a350d23c4fb751ba (diff) | |
| parent | 4dbe4378db658d29c10841791a95b8c57e7c77e5 (diff) | |
| download | zsh-a712579a2a77dfc6a7a3fe258141e652b42765fb.tar.gz zsh-a712579a2a77dfc6a7a3fe258141e652b42765fb.tar.bz2 zsh-a712579a2a77dfc6a7a3fe258141e652b42765fb.zip | |
Merge pull request #2099 from mchaisse/master
Added WIP (work in progress) feature to git.plugin
| -rw-r--r-- | plugins/git/git.plugin.zsh | 14 | ||||
| -rw-r--r-- | themes/gallois.zsh-theme | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index aad776189..bcb32384b 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -129,3 +129,17 @@ function _git_log_prettily(){ } alias glp="_git_log_prettily" 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' diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme index 3eac14867..d624e3afc 100644 --- a/themes/gallois.zsh-theme +++ b/themes/gallois.zsh-theme @@ -7,12 +7,12 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" git_custom_status() { local cb=$(current_branch) 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 } #RVM and git settings -if [[ -s ~/.rvm/scripts/rvm ]] ; then +if [[ -s ~/.rvm/scripts/rvm ]] ; then RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1' else if which rbenv &> /dev/null; then |