From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Jan 2022 22:01:28 +0000 (-0800)
Subject: Merge branch 'xw/am-empty'
X-Git-Tag: v2.35.0-rc0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ead6767ad7f835f4802248371709c4506ad6a4f1;p=thirdparty%2Fgit.git

Merge branch 'xw/am-empty'

"git am" learns "--empty=(stop|drop|keep)" option to tweak what is
done to a piece of e-mail without a patch in it.

* xw/am-empty:
  am: support --allow-empty to record specific empty patches
  am: support --empty=<option> to handle empty patches
  doc: git-format-patch: describe the option --always
---

ead6767ad7f835f4802248371709c4506ad6a4f1