diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-05 09:44:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-05 09:44:43 -0800 |
| commit | 661f3797916d2bc3bd967a9dc9e6e464d5343758 (patch) | |
| tree | 508586b650ddbda72cfec2ad9432d0d0056296a7 /Documentation/config | |
| parent | 53929db7c4962c967ee56e586264c278b29c313c (diff) | |
| parent | b9e55be7401a5413722299279fc867eb931f4c3b (diff) | |
| download | git-661f3797916d2bc3bd967a9dc9e6e464d5343758.tar.gz | |
Merge branch 'pb/ort-make-submodule-conflict-message-an-advice'
When a merge conflicted at a submodule, merge-ort backend used to
unconditionally give a lengthy message to suggest how to resolve
it. Now the message can be squelched as an advice message.
* pb/ort-make-submodule-conflict-message-an-advice:
merge-ort: turn submodule conflict suggestions into an advice
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index c7ea70f2e2..dde8e7840e 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -129,6 +129,9 @@ advice.*:: submoduleAlternateErrorStrategyDie:: Advice shown when a submodule.alternateErrorStrategy option configured to "die" causes a fatal error. + submoduleMergeConflict:: + Advice shown when a non-trivial submodule merge conflict is + encountered. submodulesNotUpdated:: Advice shown when a user runs a submodule command that fails because `git submodule update --init` was not run. |