From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Feb 2013 16:04:19 +0000 (-0800)
Subject: Merge branch 'jc/mention-tracking-for-pull-default' into maint
X-Git-Tag: v1.8.2-rc1~2^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd9c038ac93d65e1f3a9491e873e2d0bc5db73d6?ds=inline;hp=-c

Merge branch 'jc/mention-tracking-for-pull-default' into maint

* jc/mention-tracking-for-pull-default:
doc: mention tracking for pull.default
---

cd9c038ac93d65e1f3a9491e873e2d0bc5db73d6
diff --combined Documentation/config.txt
index dbb2faf602,10e28560ed..e37ba94a72
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -160,15 -160,14 +160,15 @@@ 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.
  	resolveConflict::
 -		Advices shown by various commands when conflicts
 +		Advice shown by various commands when conflicts
  		prevent the operation from being performed.
  	implicitIdentity::
  		Advice on how to set your identity configuration when
@@@ -539,14 -538,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
@@@ -963,6 -962,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
@@@ -1206,16 -1211,8 +1206,16 @@@ gitweb.snapshot:
  grep.lineNumber::
  	If set to true, enable '-n' option by default.
  
 +grep.patternType::
 +	Set the default matching behavior. Using a value of 'basic', 'extended',
 +	'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
 +	'--fixed-strings', or '--perl-regexp' option accordingly, while the
 +	value 'default' will return to the default matching behavior.
 +
  grep.extendedRegexp::
 -	If set to true, enable '--extended-regexp' option by default.
 +	If set to true, enable '--extended-regexp' option by default. This
 +	option is ignored when the 'grep.patternType' option is set to a value
 +	other than 'default'.
  
  gpg.program::
  	Use this custom program instead of "gpg" found on $PATH when
@@@ -1351,12 -1348,6 +1351,12 @@@ help.autocorrect:
  	value is 0 - the command will be just shown but not executed.
  	This is the default.
  
 +help.htmlpath::
 +	Specify the path where the HTML documentation resides. File system paths
 +	and URLs are supported. HTML pages will be prefixed with this path when
 +	help is displayed in the 'web' format. This defaults to the documentation
 +	path of your Git installation.
 +
  http.proxy::
  	Override the HTTP proxy, normally configured using the 'http_proxy',
  	'https_proxy', and 'all_proxy' environment variables (see
@@@ -1758,7 -1749,8 +1758,8 @@@ push.default:
    +
    This is currently the default, but Git 2.0 will change the default
    to `simple`.
- * `upstream` - push the current branch to its upstream branch.
+ * `upstream` - push the current branch to its upstream branch
+   (`tracking` is a deprecated synonym for this).
    With this, `git push` will update the same remote ref as the one which
    is merged by `git pull`, making `push` and `pull` symmetrical.
    See "branch.<name>.merge" for how to configure the upstream branch.