mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-24 21:27:18 +02:00
Code

Merge branch 'mm/status-push-pull-advise' 

* mm/status-push-pull-advise:
  document that statusHints affects git checkout
This commit is contained in:
Junio C Hamano 2012-12-04 13:34:10 -08:00
parent ee26a6e2b8 552755a88b
commit fb4c62235f
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.
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.