diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-03 13:05:24 -0400 |
| commit | 93b4a6c02eeafb875de5d9bcccd73bdcd8265f40 (patch) | |
| tree | 7cc87fcd416bf71cee77f30bf2e60cf607671f43 /plugins/git-flow | |
| parent | 689b5ab3c8c8bf30ee63cafb8401d7d95e41f359 (diff) | |
| parent | 0532860c618aabc02d5dab34391b967e8e4c6272 (diff) | |
| download | zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.gz zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.tar.bz2 zsh-93b4a6c02eeafb875de5d9bcccd73bdcd8265f40.zip | |
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
plugins/osx/osx.plugin.zsh
Diffstat (limited to 'plugins/git-flow')
| -rw-r--r-- | plugins/git-flow/git-flow.plugin.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh index 4357c0895..444440bcb 100644 --- a/plugins/git-flow/git-flow.plugin.zsh +++ b/plugins/git-flow/git-flow.plugin.zsh @@ -21,7 +21,7 @@ # #Alias -alias gf='git flow' +alias gfl='git flow' alias gcd='git checkout develop' alias gch='git checkout hotfix' alias gcr='git checkout release' |