From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Jan 2012 22:46:22 +0000 (-0800)
Subject: Sync with maint
X-Git-Tag: v1.7.9-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e04dc492ac1206c7a7e624c09344081263af0e66?ds=inline;hp=-c

Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

e04dc492ac1206c7a7e624c09344081263af0e66
diff --combined Documentation/config.txt
index 04f5e19dc3,9fba453f23..abeb82b2c6
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -674,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
@@@ -831,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::
@@@ -1123,17 -1098,6 +1123,17 @@@ grep.lineNumber:
  grep.extendedRegexp::
  	If set to true, enable '--extended-regexp' option by default.
  
 +gpg.program::
 +	Use this custom program instead of "gpg" found on $PATH when
 +	making or verifying a PGP signature. The program must support the
 +	same command line interface as GPG, namely, to verify a detached
 +	signature, "gpg --verify $file - <$signature" is run, and the
 +	program is expected to signal a good signature by exiting with
 +	code 0, and to generate an ascii-armored detached signature, the
 +	standard input of "gpg -bsau $key" is fed with the contents to be
 +	signed, and the program is expected to send the result to its
 +	standard output.
 +
  gui.commitmsgwidth::
  	Defines how wide the commit message window is in the
  	linkgit:git-gui[1]. "75" is the default.
@@@ -1623,16 -1587,6 +1623,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.
@@@ -1786,7 -1740,8 +1786,8 @@@ rerere.enabled:
  	conflict hunks can be resolved automatically, should they be
  	encountered again.  By default, linkgit:git-rerere[1] is
  	enabled if there is an `rr-cache` directory under the
- 	`$GIT_DIR`.
+ 	`$GIT_DIR`, e.g. if "rerere" was previously used in the
+ 	repository.
  
  sendemail.identity::
  	A configuration identity. When given, causes values in the