diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-05 10:15:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-05 10:15:36 -0800 |
| commit | e13743909da808044f9ce2250fa7d449c991ecb2 (patch) | |
| tree | 49236c7d0c7bd73f79da3dfbabd490f8b0d69f8a /git-config.html | |
| parent | ff921867bef0a1b24753e19e4be0cf824eca22bf (diff) | |
| download | git-htmldocs-e13743909da808044f9ce2250fa7d449c991ecb2.tar.gz | |
Autogenerated HTML docs for v2.44.0-117-g43072b
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-config.html b/git-config.html index 5a700404f..c7133bf50 100644 --- a/git-config.html +++ b/git-config.html @@ -2302,6 +2302,15 @@ submoduleAlternateErrorStrategyDie </p>
</dd>
<dt class="hdlist1">
+submoduleMergeConflict
+</dt>
+<dd>
+<p>
+ Advice shown when a non-trivial submodule merge conflict is
+ encountered.
+</p>
+</dd>
+<dt class="hdlist1">
submodulesNotUpdated
</dt>
<dd>
|