]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e4fc50 5768478)
Merge branch 'js/defeat-ignore-submodules-config-with-explicit-addition'
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2023 18:21:17 +0000 (11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2023 18:21:17 +0000 (11:21 -0700)
commit4ee088deb83e2a4a78ac3882168b3e8fadd4f541
tree0125def176094b6e47746063746ea99fce0cb715tree | snapshot
parent4e4fc50cf733bb0071e43ea128b13439b93975d2commit | diff
parent5768478edc2bccb6a3d6200e430490573140bfa6commit | diff
Merge branch 'js/defeat-ignore-submodules-config-with-explicit-addition'

Even when diff.ignoreSubmodules tells us to ignore submodule
changes, "git commit" with an index that already records changes to
submodules should include the submodule changes in the resulting
commit, but it did not.

* js/defeat-ignore-submodules-config-with-explicit-addition:
  diff-lib: honor override_submodule_config flag bit
Unnamed repository; edit this file 'description' to name the repository.