diff options
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>
|