Merge branch 'maint'

* maint:
  Documentation: Document signature showing options
  completion: fix shell expansion of items

diff --cc contrib/completion/git-completion.bash
Simple merge