Merge branch 'nd/rebase-forget' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:10 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:10 +0000 (10:57 -0800)
commit50b5d28af4659e980216e6a164f5ae0978e161d5
treeb8a5211a195c4bb636199ac9a54c806e5e974d35
parent1f46421a59c56743f6db30fee3b0cfc4451f4020
parent9512177b68263085fef84cdbd45ecdee7bfe2377
Merge branch 'nd/rebase-forget' into next

"git rebase" learned "--forget" 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
Documentation/git-rebase.txt
contrib/completion/git-completion.bash
git-rebase.sh