Merge branch 'nd/am-quit'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 21:37:52 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2018 21:37:52 +0000 (13:37 -0800)
"git am" has learned the "--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

1  2 
builtin/am.c

diff --cc builtin/am.c
Simple merge