diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:35 -0800 |
| commit | d3096d2ba68aa6814d531317433f1cdcd76ba55c (patch) | |
| tree | bd4aee07adf43114a4501a2cb187ffc8629cfcc0 /Documentation/technical/api-submodule-config.txt | |
| parent | Merge branch 'ns/test-desc-typofix' (diff) | |
| parent | Fix spelling errors in no-longer-updated-from-upstream modules (diff) | |
| download | git-d3096d2ba68aa6814d531317433f1cdcd76ba55c.tar.gz git-d3096d2ba68aa6814d531317433f1cdcd76ba55c.zip | |
Merge branch 'en/doc-typofix'
Docfix.
* en/doc-typofix:
Fix spelling errors in no-longer-updated-from-upstream modules
multimail: fix a few simple spelling errors
sha1dc: fix trivial comment spelling error
Fix spelling errors in test commands
Fix spelling errors in messages shown to users
Fix spelling errors in names of tests
Fix spelling errors in comments of testcases
Fix spelling errors in code comments
Fix spelling errors in documentation outside of Documentation/
Documentation: fix a bunch of typos, both old and new
Diffstat (limited to 'Documentation/technical/api-submodule-config.txt')
| -rw-r--r-- | Documentation/technical/api-submodule-config.txt | 2 |
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). |