From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2022 22:38:48 +0000 (-0700)
Subject: Merge branch 'rs/combine-diff-with-incompatible-options'
X-Git-Tag: v2.38.0-rc0~187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2d1f00bdd79e3059e6a819c0f65e8071e39dac8;p=thirdparty%2Fgit.git

Merge branch 'rs/combine-diff-with-incompatible-options'

Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.

* rs/combine-diff-with-incompatible-options:
  combine-diff: abort if --output is given
  combine-diff: abort if --ignore-matching-lines is given
---

a2d1f00bdd79e3059e6a819c0f65e8071e39dac8