Merge branch 'tb/complete-rebase-i-edit-todo'

The command-line completion script (in contrib/) has been updated. * tb/complete-rebase-i-edit-todo: completion: offer '--edit-todo' during interactive rebase