{"thread":{"id":"33457","subject":"[PATCH] completion: add more cherry-pick options","startedAt":"2013-04-10T09:08:18Z","lastAt":"2013-04-10T09:08:18Z","messageCount":1,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"213758","messageId":"1365584898-4842-1-git-send-email-felipe.contreras@gmail.com","threadId":"33457","inReplyTo":null,"subject":"[PATCH] completion: add more cherry-pick options","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-04-10T09:08:18Z","receivedAt":"2013-04-10T09:08:18Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n contrib/completion/git-completion.bash | 7 ++++++-\n 1 file changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 93eba46..d257b90 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1124,9 +1124,14 @@ _git_cherry ()\n \n _git_cherry_pick ()\n {\n+\tlocal dir=\"$(__gitdir)\"\n+\tif [ -f \"$dir\"/CHERRY_PICK_HEAD ]; then\n+\t\t__gitcomp \"--continue --quit --abort\"\n+\t\treturn\n+\tfi\n \tcase \"$cur\" in\n \t--*)\n-\t\t__gitcomp \"--edit --no-commit\"\n+\t\t__gitcomp \"--edit --no-commit --signoff --strategy= --mainline\"\n \t\t;;\n \t*)\n \t\t__gitcomp_nl \"$(__git_refs)\"\n-- \n1.8.2.1\n"}]}