From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Mar 2020 18:21:19 +0000 (-0700)
Subject: Merge branch 'pb/am-show-current-patch'
X-Git-Tag: v2.26.0-rc1~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e0d717537547e8fcba441e4f65237c7fd227a34;p=thirdparty%2Fgit.git

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()
---

0e0d717537547e8fcba441e4f65237c7fd227a34