`869b1046a421b67cac88da4a55872d87904bd3b7`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2015-08-31 04:32 UTC

Message

Merge pull request #4292 from cxbig/master

improved alias conflict between git flow & git fetch

Diff

 1diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
 2index 4357c08957e6f7373df0dbcd465db2d59719f6f9..444440bcb8afeff1a3f699e694d834210d793087 100644
 3--- a/plugins/git-flow/git-flow.plugin.zsh
 4+++ b/plugins/git-flow/git-flow.plugin.zsh
 5@@ -21,7 +21,7 @@
 6 #
 7 
 8 #Alias
 9-alias gf='git flow'
10+alias gfl='git flow'
11 alias gcd='git checkout develop'
12 alias gch='git checkout hotfix'
13 alias gcr='git checkout release'