Skip to content
Browse files

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

* mm/status-push-pull-advise:
  document that statusHints affects git checkout
  • Loading branch information...
2 parents ee26a6e + 552755a commit fb4c62235fee8008d99ef55c4adcb1f7ea9508a3 @gitster gitster committed Dec 4, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 Documentation/config.txt
5 Documentation/config.txt
@@ -160,9 +160,10 @@ advice.*::
it resulted in a non-fast-forward error.
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.
Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes.

1 comment on commit fb4c622



Please sign in to comment.
Something went wrong with that request. Please try again.