tree 1cb5ad50202b03853e3baef2b26fd13a29df45ac
parent 9b7f726dfcf35d3a2dbfd150b64ca9b01e810b44
parent aa416b22ea73321aba94c3c96db0491fb25ea7ea
author Junio C Hamano <gitster@pobox.com> 1583778079 -0700
committer Junio C Hamano <gitster@pobox.com> 1583778079 -0700

Merge branch 'pb/am-show-current-patch'

"git am --short-current-patch" is a way to show the piece of e-mail
for the stopped step, which is not suitable to directly feed "git
apply" (it is designed to be a good "git am" input).  It learned a
new option to show only the patch part.

* pb/am-show-current-patch:
  am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch
  am: support --show-current-patch=raw as a synonym for--show-current-patch
  am: convert "resume" variable to a struct
  parse-options: convert "command mode" to a flag
  parse-options: add testcases for OPT_CMDMODE()