From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:35 +0000 (-0800)
Subject: Merge branch 'nd/rebase-forget'
X-Git-Tag: v2.12.0-rc0~130
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/06cd5a1e01328724b7709ac232e36263e59f5f26

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
---

06cd5a1e01328724b7709ac232e36263e59f5f26
diff --cc git-rebase.sh
index 04f6e44bc8,c62b17863e..48d7c5ded4
--- a/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