summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-submodule-config.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/technical/api-submodule-config.txt')
-rw-r--r--Documentation/technical/api-submodule-config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-submodule-config.txt b/Documentation/technical/api-submodule-config.txt
index fb06089393..c409559b86 100644
--- a/Documentation/technical/api-submodule-config.txt
+++ b/Documentation/technical/api-submodule-config.txt
@@ -58,7 +58,7 @@ Functions
Whenever a submodule configuration is parsed in `parse_submodule_config_option`
via e.g. `gitmodules_config()`, it will overwrite the null_sha1 entry.
-So in the normal case, when HEAD:.gitmodules is parsed first and then overlayed
+So in the normal case, when HEAD:.gitmodules is parsed first and then overlaid
with the repository configuration, the null_sha1 entry contains the local
configuration of a submodule (e.g. consolidated values from local git
configuration and the .gitmodules file in the worktree).