Skip to content

Commit

Permalink
document that statusHints affects git checkout
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Dec 4, 2012
1 parent 491e307 commit 552755a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 552755a

Please sign in to comment.