From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jul 2022 20:00:32 +0000 (-0700)
Subject: Merge branch 'rs/combine-diff-with-incompatible-options' into maint
X-Git-Tag: v2.37.2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c915bb11e2503beffc5f4b2926c531521c3fdf1;p=thirdparty%2Fgit.git

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

Certain diff options are currently ignored when combined-diff is
shown; mark them as incompatible with the feature.
source: <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com>

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

2c915bb11e2503beffc5f4b2926c531521c3fdf1