Merge branch 'nd/rebase-forget'

"git rebase" learned "--quit" option, which allows a user to
remove the metadata left by an earlier "git rebase" that was
manually aborted without using "git rebase --abort".

* nd/rebase-forget:
  rebase: add --quit to cleanup rebase, leave everything else untouched

diff --cc Documentation/git-rebase.txt
Simple merge

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

diff --cc git-rebase.sh
index 04f6e44bc8c779d7f4c60c19066820533279324a,c62b17863e2132da5d1e78697fb3b8feb3629a60..48d7c5ded40e1801a36a897849e0f32b314e5981
--- 1/git-rebase.sh
--- 2/git-rebase.sh
+++ b/git-rebase.sh
@@@ -43,8 -43,10 +43,9 @@@ continue!          continu
  abort!             abort and check out the original branch
  skip!              skip current patch and continue
  edit-todo!         edit the todo list during an interactive rebase
+ quit!              abort but keep HEAD where it is
  "
  . git-sh-setup
 -. git-sh-i18n
  set_reflog_action rebase
  require_work_tree_exists
  cd_to_toplevel