Merge branch 'nd/am-quit' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:19 +0000 (15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 23:41:19 +0000 (15:41 -0800)
commit9a9cb40c2f89413b9c3330249e20686b9ab050fb
tree517ca057eb79d877aa87896fe33884819d9149d5
parent6ef6a130bf2f9fc28fc26198bd62c35785d1bb85
parent65ed8ff376c4fdd8dd560b3ddbf7d6cd771f860e
Merge branch 'nd/am-quit' into next

"git am" has learned "--quit" option, in addition to the existing
"--abort" option; having the pair mirrors a few other commands like
"rebase" and "cherry-pick".

* nd/am-quit:
  am: support --quit
builtin/am.c