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)
commitf0442976149da225fd9e7796436b2122a6bb7f0f
tree07db193c44d53613b45da628209522ee42ba4f5f
parentb330051982756f2f18a6718e603ceb99302dc16e
parentd3bfbf91dfb4257b064cce6e5860e8e7317e6da8
Merge branch 'mg/complete-cherry-mark-to-log'

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