Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a652c88b27cc29f14caba12549770d66cb4e10e4..5ed18215fdefe1c4864ae5c6f01a86a9ff36d012 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -641,6 +641,7 @@ _git_log ()
                        --all-match
                        --pretty= --name-status --name-only --raw
                        --not --all
+                       --left-right --cherry-pick
                        "
                return
                ;;