`215d6da3dedd44d8ec23ccb34b54f14d9f96428f`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2012-12-02 20:39 UTC

Message

Merge pull request #1277 from waveface/master

git flow completion enhancement

Diff

 1diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh
 2index ea4caa016205bfa6b79ce1c7db7a1836327f3213..4afb85b8b98523aa7ca56282607f144f7b4b56c4 100644
 3--- a/plugins/git-flow/git-flow.plugin.zsh
 4+++ b/plugins/git-flow/git-flow.plugin.zsh
 5@@ -221,6 +221,7 @@ __git-flow-feature ()
 6 					_arguments \
 7 						-F'[Fetch from origin before performing finish]' \
 8 						-r'[Rebase instead of merge]'\
 9+						-k'[Keep branch after performing finish]'\
10 						':feature:__git_flow_feature_list'
11 				;;
12