Merge branch 'tb/complete-rebase-i-edit-todo'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:48:56 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:48:56 +0000 (14:48 -0700)
The command-line completion script (in contrib/) has been updated.

* tb/complete-rebase-i-edit-todo:
  completion: offer '--edit-todo' during interactive rebase


Trivial merge