diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-27 13:00:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-27 13:00:32 -0700 |
| commit | 2c915bb11e2503beffc5f4b2926c531521c3fdf1 (patch) | |
| tree | 2cd3df8f0983f9489aa00185e039ed802a02dc1b /commit.c | |
| parent | 8f6b482d245ad8eb0fe3dccada91ee89aa17bf39 (diff) | |
| parent | cfb19ae05f4565bc9d0a0cb3a23a3d2ab9fb8fab (diff) | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions