diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-11 15:38:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-11 15:38:48 -0700 |
| commit | a2d1f00bdd79e3059e6a819c0f65e8071e39dac8 (patch) | |
| tree | 0f075cd0f4f191f185f1216aec7c937deb44b86e /Documentation/diff-format.txt | |
| parent | 30cc8d0f147546d4dd77bf497f4dec51e7265bd8 (diff) | |
| parent | cfb19ae05f4565bc9d0a0cb3a23a3d2ab9fb8fab (diff) | |
| download | git-a2d1f00bdd79e3059e6a819c0f65e8071e39dac8.tar.xz | |
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
Diffstat (limited to 'Documentation/diff-format.txt')
0 files changed, 0 insertions, 0 deletions