]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f6b482 cfb19ae)
Merge branch 'rs/combine-diff-with-incompatible-options' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 20:00:32 +0000 (13:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 20:00:32 +0000 (13:00 -0700)
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

1  2 
combine-diff.c patch | diff1 | diff2 | blob | history

diff --cc combine-diff.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.