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

Merge remote-tracking branch 'bors-ltd/master'

Browse source 
Conflicts:
	plugins/git/git.plugin.zsh
This commit is contained in:
Gaetan Semet 2013-07-05 16:12:56 +02:00
commit c7d4c417f9
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,6 @@ alias grh='git reset HEAD'
compdef _git grh=git-reset
alias grhh='git reset HEAD --hard'
compdef _git grhh=git-reset
alias gclean='git reset --hard && git clean -dfx'
compdef _git gclean=git-reset
alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
compdef _git gwc=git-whatchanged

2
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -1,4 +1,4 @@
virtualenvwrapper='virtualenvwrapper_lazy.sh'
virtualenvwrapper='virtualenvwrapper.sh'
if (( $+commands[$virtualenvwrapper] )); then
source ${${virtualenvwrapper}:c}