Merge branch 'mg/complete-cherry-mark-to-log'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:39 +0000 (14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:40 +0000 (14:12 -0700)
The completion scripts (in contrib/) did not include the
"--cherry-mark" option when completing "git log <HT>".

* mg/complete-cherry-mark-to-log:
  completion: complete --cherry-mark for git log

contrib/completion/git-completion.bash

index ffe6004..3402475 100644 (file)
@@ -1458,6 +1458,7 @@ _git_log ()
                        --relative-date --date=
                        --pretty= --format= --oneline
                        --show-signature
+                       --cherry-mark
                        --cherry-pick
                        --graph
                        --decorate --decorate=