diff options
| author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
|---|---|---|
| committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
| commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
| tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/git-flow/git-flow.plugin.zsh | |
| parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip | |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/git-flow/git-flow.plugin.zsh')
| -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' |