]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30cc8d0 cfb19ae)
Merge branch 'rs/combine-diff-with-incompatible-options'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2022 22:38:48 +0000 (15:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2022 22:38:48 +0000 (15:38 -0700)
commita2d1f00bdd79e3059e6a819c0f65e8071e39dac8
tree0f075cd0f4f191f185f1216aec7c937deb44b86etree | snapshot
parent30cc8d0f147546d4dd77bf497f4dec51e7265bd8commit | diff
parentcfb19ae05f4565bc9d0a0cb3a23a3d2ab9fb8fabcommit | diff
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
combine-diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.