]> Kevux Git Server - rit/commit
projects / rit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2823d92 5ed8c5b)
Merge branch 'kj/renamed-submodule'
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Aug 2025 18:53:56 +0000 (11:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Aug 2025 18:53:56 +0000 (11:53 -0700)
commit8982c5e909394a1bb51fc4103875e0e7a2601972
tree140008bbccf17b566427ebcf724fefc0a6c94c81tree | snapshot
parent2823d928b4adf4083e846385a7045bdd24eb926bcommit | diff
parent5ed8c5b465aaeae967875d043187668bdc0dfe54commit | diff
Merge branch 'kj/renamed-submodule'

The case where a new submodule takes a path where used to be a
completely different subproject is now dealt a bit better than
before.

* kj/renamed-submodule:
  fixup! submodule: skip redundant active entries when pattern covers path
  fixup! submodule: prevent overwriting .gitmodules on path reuse
  submodule: skip redundant active entries when pattern covers path
  submodule: prevent overwriting .gitmodules on path reuse
builtin/submodule--helper.c diff1 | diff2 | blob | history
Git without Rust.