linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-22 04:51:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'upstream/master'

Browse source 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>

# Conflicts:
#	plugins/npm/npm.plugin.zsh
This commit is contained in:
Gaetan Semet 2017-11-28 23:09:48 +01:00
commit 95391749ab
50 changed files with 957 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/git-flow/git-flow.plugin.zsh
View file

@ -35,6 +35,10 @@ alias gflrs='git flow release start'
alias gflff='git flow feature finish'
alias gflhf='git flow hotfix finish'
alias gflrf='git flow release finish'
alias gflfp='git flow feature publish'
alias gflhp='git flow hotfix publish'
alias gflrp='git flow release publish'
alias gflfpll='git flow feature pull'
_git-flow ()
{