document that statusHints affects git checkout
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Dec 4, 2012 at 10:15 UTC
552755a88b3b4c28166336a0f4ffac08cf43fb89
1 file changed
+3
-2
Documentation/config.txt
+3
-2
@@ -160,9 +160,10 @@ advice.*::
160
it resulted in a non-fast-forward error.
161
statusHints::
162
Show directions on how to proceed from the current
163
- state in the output of linkgit:git-status[1] and in
163
+ state in the output of linkgit:git-status[1], in
164
the template shown when writing commit messages in
165
- linkgit:git-commit[1].
165
+ linkgit:git-commit[1], and in the help message shown
166
+ by linkgit:git-checkout[1] when switching branch.
167
commitBeforeMerge::
168
Advice shown when linkgit:git-merge[1] refuses to
169
merge to avoid overwriting local changes.