Sync with maint

* maint:
  Update draft release notes to 1.8.2.2
  completion: remove duplicate block for "git commit -c"
  cherry-pick/revert: make usage say '<commit-ish>...'

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