undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

document that statusHints affects git checkout

Browse Source 
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
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config.txt
View File

@ -160,9 +160,10 @@ advice.*::
it resulted in a non-fast-forward error. it resulted in a non-fast-forward error.
statusHints:: statusHints::
Show directions on how to proceed from the current 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:: commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes. merge to avoid overwriting local changes.