From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Dec 2012 21:34:10 +0000 (-0800)
Subject: Merge branch 'mm/status-push-pull-advise'
X-Git-Tag: v1.8.1-rc1~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb4c62235fee8008d99ef55c4adcb1f7ea9508a3?ds=inline;hp=-c

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

* mm/status-push-pull-advise:
document that statusHints affects git checkout
---

fb4c62235fee8008d99ef55c4adcb1f7ea9508a3
diff --combined Documentation/config.txt
index e70216dfe6,ae572a937e..bf8f911e1f
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -160,9 -160,10 +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.
@@@ -538,14 -539,14 +539,14 @@@ core.pager:
  	`LESS` variable to some other value.  Alternately,
  	these settings can be overridden on a project or
  	global basis by setting the `core.pager` option.
 -	Setting `core.pager` has no affect on the `LESS`
 +	Setting `core.pager` has no effect on the `LESS`
  	environment variable behaviour above, so if you want
  	to override git's default settings this way, you need
  	to be explicit.  For example, to disable the S option
  	in a backward compatible manner, set `core.pager`
 -	to `less -+$LESS -FRX`.  This will be passed to the
 -	shell by git, which will translate the final command to
 -	`LESS=FRSX less -+FRSX -FRX`.
 +	to `less -+S`.  This will be passed to the shell by
 +	git, which will translate the final command to
 +	`LESS=FRSX less -+S`.
  
  core.whitespace::
  	A comma separated list of common whitespace problems to
@@@ -962,6 -963,12 +963,6 @@@ difftool.<tool>.cmd:
  difftool.prompt::
  	Prompt before each invocation of the diff tool.
  
 -diff.wordRegex::
 -	A POSIX Extended Regular Expression used to determine what is a "word"
 -	when performing word-by-word difference calculations.  Character
 -	sequences that match the regular expression are "words", all other
 -	characters are *ignorable* whitespace.
 -
  fetch.recurseSubmodules::
  	This option can be either set to a boolean value or to 'on-demand'.
  	Setting it to a boolean changes the behavior of fetch and pull to