Merge branch 'dd/mailinfo-quoted-cr'
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:23 +0000 (21:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 May 2021 12:05:23 +0000 (21:05 +0900)
commit483932a3d8dae23207de8ec8683a5236ef3098d9
tree39286e75cc8f9bf8b016965fc384ee078a117a98
parentc8e34a7ac20b5d512cb2f1f789eca2a3b12b129f
parent59b519ab7e703ebdbad06bd9ba3cae6e55d880d0
Merge branch 'dd/mailinfo-quoted-cr'

"git mailinfo" (hence "git am") learned the "--quoted-cr" option to
control how lines ending with CRLF wrapped in base64 or qp are
handled.

* dd/mailinfo-quoted-cr:
  am: learn to process quoted lines that ends with CRLF
  mailinfo: allow stripping quoted CR without warning
  mailinfo: allow squelching quoted CRLF warning
  mailinfo: warn if CRLF found in decoded base64/QP email
  mailinfo: stop parsing options manually
  mailinfo: load default metainfo_charset lazily
contrib/completion/git-completion.bash
mailinfo.c