From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Sep 2020 20:53:07 +0000 (-0700)
Subject: Merge branch 'so/separate-field-for-m-and-diff-merges'
X-Git-Tag: v2.29.0-rc0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1ce30d364e2161c558466cf938ca71fb456f6c3;p=thirdparty%2Fgit.git

Merge branch 'so/separate-field-for-m-and-diff-merges'

Internal API clean-up to handle two options "diff-index" and "log"
have, which happen to share the same short form, more sensibly.

* so/separate-field-for-m-and-diff-merges:
  revision: add separate field for "-m" of "diff-index -m"
---

c1ce30d364e2161c558466cf938ca71fb456f6c3