document that statusHints affects git checkout

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 11f320b96267e7bd11f23f13842ca9f92cac6f7f..ae572a937e5fe61fb4f85aeb4adf3fb797a2334a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -160,9 +160,10 @@ advice.*::
                it resulted in a non-fast-forward error.
        statusHints::
                Show directions on how to proceed from the current
                it resulted in a non-fast-forward error.
        statusHints::
                Show directions on how to proceed from the current

-               state in the output of linkgit:git-status[1] and in
+               state in the output of linkgit:git-status[1], in

                the template shown when writing commit messages in
                the template shown when writing commit messages in

-               linkgit:git-commit[1].
+               linkgit:git-commit[1], and in the help message shown
+               by linkgit:git-checkout[1] when switching branch.

        commitBeforeMerge::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.
        commitBeforeMerge::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.