sequencer: allow disabling conflict advice

[thirdparty/git.git] / Documentation / config / advice.txt

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index dd52041bc94f13fe4b3cc718bb5ead5b6d8c1221..0e35ae5240fa523039524b52aaeccd41e62820ac 100644 (file)
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -56,6 +56,8 @@ advice.*::
                Shown when the user's information is guessed from the
                system username and domain name, to tell the user how to
                set their identity configuration.
+       mergeConflict::
+               Shown when various commands stop because of conflicts.
        nestedTag::
                Shown when a user attempts to recursively tag a tag object.
        pushAlreadyExists::
@@ -94,6 +96,9 @@ advice.*::
                `pushNonFFCurrent`, `pushNonFFMatching`, `pushAlreadyExists`,
                `pushFetchFirst`, `pushNeedsForce`, and `pushRefNeedsUpdate`
                simultaneously.
+       refSyntax::
+               Shown when the user provides an illegal ref name, to
+               tell the user about the ref syntax documentation.
        resetNoRefresh::
                Shown when linkgit:git-reset[1] takes more than 2
                seconds to refresh the index after reset, to tell the user
@@ -129,6 +134,9 @@ advice.*::
        submoduleAlternateErrorStrategyDie::
                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::
                Shown when a user runs a submodule command that fails
                because `git submodule update --init` was not run.