Merge branch 'mm/complete-rebase-autostash'

* mm/complete-rebase-autostash:
  git-completion: add --autostash for 'git rebase'

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