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
This commit is contained in:
Junio C Hamano
2016-12-19 14:45:35 -08:00
4 changed files with 37 additions and 4 deletions

View File

@ -43,6 +43,7 @@ continue! continue
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
set_reflog_action rebase
@ -241,7 +242,7 @@ do
--verify)
ok_to_skip_pre_rebase=
;;
--continue|--skip|--abort|--edit-todo)
--continue|--skip|--abort|--quit|--edit-todo)
test $total_argc -eq 2 || usage
action=${1##--}
;;
@ -399,6 +400,9 @@ abort)
finish_rebase
exit
;;
quit)
exec rm -rf "$state_dir"
;;
edit-todo)
run_specific_rebase
;;