From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Dec 2011 21:25:29 +0000 (-0800)
Subject: Merge branch 'jc/advice-doc'
X-Git-Tag: v1.7.9-rc0~36
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/184a541fb54fbb9d062f30ee47ae629af7f5784c?ds=inline;hp=-c

Merge branch 'jc/advice-doc'

* jc/advice-doc:
advice: Document that they all default to true
---

184a541fb54fbb9d062f30ee47ae629af7f5784c
diff --combined Documentation/config.txt
index c6630c73e8,f22d926777..6e63b5938f
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -115,35 -115,32 +115,32 @@@ in the appropriate manual page. You wil
  porcelain configuration variables in the respective porcelain documentation.
  
  advice.*::
- 	When set to 'true', display the given optional help message.
- 	When set to 'false', do not display. The configuration variables
- 	are:
+ 	These variables control various optional help messages designed to
+ 	aid new users. All 'advice.*' variables default to 'true', and you
+ 	can tell Git that you do not need help by setting these to 'false':
  +
  --
  	pushNonFastForward::
  		Advice shown when linkgit:git-push[1] refuses
- 		non-fast-forward refs. Default: true.
+ 		non-fast-forward refs.
  	statusHints::
  		Directions on how to stage/unstage/add shown in the
  		output of linkgit:git-status[1] and the template shown
- 		when writing commit messages. Default: true.
+ 		when writing commit messages.
  	commitBeforeMerge::
  		Advice shown when linkgit:git-merge[1] refuses to
  		merge to avoid overwriting local changes.
- 		Default: true.
  	resolveConflict::
  		Advices shown by various commands when conflicts
  		prevent the operation from being performed.
- 		Default: true.
  	implicitIdentity::
  		Advice on how to set your identity configuration when
  		your information is guessed from the system username and
- 		domain name. Default: true.
- 
+ 		domain name.
  	detachedHead::
- 		Advice shown when you used linkgit::git-checkout[1] to
+ 		Advice shown when you used linkgit:git-checkout[1] to
  		move to the detach HEAD state, to instruct how to create
- 		a local branch after the fact.  Default: true.
+ 		a local branch after the fact.
  --
  
  core.fileMode::
@@@ -677,12 -674,10 +674,12 @@@ branch.<name>.mergeoptions:
  branch.<name>.rebase::
  	When true, rebase the branch <name> on top of the fetched branch,
  	instead of merging the default branch from the default remote when
 -	"git pull" is run.
 -	*NOTE*: this is a possibly dangerous operation; do *not* use
 -	it unless you understand the implications (see linkgit:git-rebase[1]
 -	for details).
 +	"git pull" is run. See "pull.rebase" for doing this in a non
 +	branch-specific manner.
 ++
 +*NOTE*: this is a possibly dangerous operation; do *not* use
 +it unless you understand the implications (see linkgit:git-rebase[1]
 +for details).
  
  browser.<tool>.cmd::
  	Specify the command to invoke the specified browser. The
@@@ -834,29 -829,6 +831,29 @@@ commit.template:
  	"{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
  	specified user's home directory.
  
 +credential.helper::
 +	Specify an external helper to be called when a username or
 +	password credential is needed; the helper may consult external
 +	storage to avoid prompting the user for the credentials. See
 +	linkgit:gitcredentials[7] for details.
 +
 +credential.useHttpPath::
 +	When acquiring credentials, consider the "path" component of an http
 +	or https URL to be important. Defaults to false. See
 +	linkgit:gitcredentials[7] for more information.
 +
 +credential.username::
 +	If no username is set for a network authentication, use this username
 +	by default. See credential.<context>.* below, and
 +	linkgit:gitcredentials[7].
 +
 +credential.<url>.*::
 +	Any of the credential.* options above can be applied selectively to
 +	some credentials. For example "credential.https://example.com.username"
 +	would set the default username only for https connections to
 +	example.com. See linkgit:gitcredentials[7] for details on how URLs are
 +	matched.
 +
  include::diff-config.txt[]
  
  difftool.<tool>.path::
@@@ -1615,16 -1587,6 +1612,16 @@@ pretty.<name>:
  	Note that an alias with the same name as a built-in format
  	will be silently ignored.
  
 +pull.rebase::
 +	When true, rebase branches on top of the fetched branch, instead
 +	of merging the default branch from the default remote when "git
 +	pull" is run. See "branch.<name>.rebase" for setting this on a
 +	per-branch basis.
 ++
 +*NOTE*: this is a possibly dangerous operation; do *not* use
 +it unless you understand the implications (see linkgit:git-rebase[1]
 +for details).
 +
  pull.octopus::
  	The default merge strategy to use when pulling multiple branches
  	at once.