1
0
mirror of https://github.com/git/git.git synced 2024-09-28 19:42:15 +02:00

document that statusHints affects git checkout

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2012-12-04 10:15:03 +01:00 committed by Junio C Hamano
parent 491e3075a2
commit 552755a88b

@ -160,9 +160,10 @@ advice.*::
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
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.