summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/2.51.0.adoc13
-rw-r--r--Documentation/git-submodule.adoc7
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.51.0.adoc b/Documentation/RelNotes/2.51.0.adoc
index a89d459d2e..f8adc2c5cf 100644
--- a/Documentation/RelNotes/2.51.0.adoc
+++ b/Documentation/RelNotes/2.51.0.adoc
@@ -67,6 +67,11 @@ UI, Workflows & Features
* "git switch" and "git restore" are declared to be no longer
experimental.
+ * "git -c alias.foo=bar foo -h baz" reported "'foo' is aliased to
+ 'bar'" and then went on to run "git foo -h baz", which was
+ unexpected. Tighten the rule so that alias expansion is reported
+ only when "-h" is the sole option.
+
Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
@@ -136,6 +141,9 @@ Performance, Internal Implementation, Development Support etc.
support a single object source that belongs to one repository. A
midx does span mulitple "object sources".
+ * Reduce implicit assumption and dependence on the_repository in the
+ object-file subsystem.
+
Fixes since v2.50
-----------------
@@ -284,6 +292,11 @@ including security updates, are included in this release.
and also they learn to honor the -U<n> command-line option.
(merge 2b3ae04011 lm/add-p-context later to maint).
+ * 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.
+ (merge 5ed8c5b465 kj/renamed-submodule later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge b257adb571 lo/my-first-ow-doc-update later to maint).
(merge 8b34b6a220 ly/sequencer-update-squash-is-fixup-only later to maint).
diff --git a/Documentation/git-submodule.adoc b/Documentation/git-submodule.adoc
index 87d8e0f0c5..503c84a200 100644
--- a/Documentation/git-submodule.adoc
+++ b/Documentation/git-submodule.adoc
@@ -307,6 +307,13 @@ OPTIONS
--force::
This option is only valid for add, deinit and update commands.
When running add, allow adding an otherwise ignored submodule path.
+ This option is also used to bypass a check that the submodule's name
+ is not already in use. By default, 'git submodule add' will fail if
+ the proposed name (which is derived from the path) is already registered
+ for another submodule in the repository. Using '--force' allows the command
+ to proceed by automatically generating a unique name by appending a number
+ to the conflicting name (e.g., if a submodule named 'child' exists, it will
+ try 'child1', and so on).
When running deinit the submodule working trees will be removed even
if they contain local changes.
When running update (only effective with the checkout procedure),