diff options
| author | Robby Russell <robby@planetargon.com> | 2015-08-30 21:32:45 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-08-30 21:32:45 -0700 |
| commit | 869b1046a421b67cac88da4a55872d87904bd3b7 (patch) | |
| tree | 3f9d369104e0ba780770032d0b6eb7e930aab78b | |
| parent | b3f167d998580d4017a16c23c233925a5cb7afb0 (diff) | |
| parent | acf6039ff391cd868814d5df714fb26339f1009b (diff) | |
| download | zsh-869b1046a421b67cac88da4a55872d87904bd3b7.tar.gz zsh-869b1046a421b67cac88da4a55872d87904bd3b7.tar.bz2 zsh-869b1046a421b67cac88da4a55872d87904bd3b7.zip | |
Merge pull request #4292 from cxbig/master
improved alias conflict between git flow & git fetch
| -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' |