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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Gaetan Semet 2014-01-18 12:09:59 +01:00
commit 43da92c071
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/git/git.plugin.zsh
View file

@ -312,13 +312,13 @@ compdef _git glp=git-log
# #
# This function return a warning if the current branch is a wip # This function return a warning if the current branch is a wip
function work_in_progress() { function work_in_progress() {
if $(git log -n 1 2>/dev/null | grep -q -c wip); then if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then
echo "WIP!!" echo "WIP!!"
fi fi
} }
# these alias commit and uncomit wip branches # 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 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' alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
# these alias ignore changes to file # these alias ignore changes to file
alias gignore='git update-index --assume-unchanged' alias gignore='git update-index --assume-unchanged'

2
plugins/tmuxinator/_tmuxinator
View file

@ -25,7 +25,7 @@ case $state in
args) args)
case $line[1] in case $line[1] in
start|open|copy|delete) start|open|copy|delete)
_configs=(`find ~/.tmuxinator/ -name \*.yml | cut -d/ -f5 | sed s:.yml::g`) _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
_values 'configs' $_configs _values 'configs' $_configs
ret=0 ret=0
;; ;;

2
themes/af-magic.zsh-theme
View file

@ -27,7 +27,7 @@ eval my_gray='$FG[237]'
eval my_orange='$FG[214]' eval my_orange='$FG[214]'
# right prompt # right prompt
PROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%'
# git settings # git settings
ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:" ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:"