From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Jul 2016 17:49:23 +0000 (-0700)
Subject: Sync with 2.9.2
X-Git-Tag: v2.10.0-rc0~117
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82246e075e5c028dd886adda68e28de092e33df1?ds=inline;hp=-c

Sync with 2.9.2

* maint:
Git 2.9.2
t0006: skip "far in the future" test when unsigned long is not long enough
---

82246e075e5c028dd886adda68e28de092e33df1
diff --combined Documentation/git.txt
index c461701f57,4ee0b36360..f4dfc9d42c
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,10 +43,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.9.1/git.html[documentation for release 2.9.1]
+ * link:v2.9.2/git.html[documentation for release 2.9.2]
  
  * release notes for
+   link:RelNotes/2.9.2.txt[2.9.2],
    link:RelNotes/2.9.1.txt[2.9.1],
    link:RelNotes/2.9.0.txt[2.9].
  
@@@ -514,7 -515,7 +515,7 @@@ OPTION
  
  --help::
  	Prints the synopsis and a list of the most commonly used
 -	commands. If the option '--all' or '-a' is given then all
 +	commands. If the option `--all` or `-a` is given then all
  	available commands are printed. If a Git command is named this
  	option will bring up the manual page for that command.
  +
@@@ -856,16 -857,16 +857,16 @@@ Git so take care if using a foreign fro
  	If the `GIT_DIR` environment variable is set then it
  	specifies a path to use instead of the default `.git`
  	for the base of the repository.
 -	The '--git-dir' command-line option also sets this value.
 +	The `--git-dir` command-line option also sets this value.
  
  `GIT_WORK_TREE`::
  	Set the path to the root of the working tree.
 -	This can also be controlled by the '--work-tree' command-line
 +	This can also be controlled by the `--work-tree` command-line
  	option and the core.worktree configuration variable.
  
  `GIT_NAMESPACE`::
  	Set the Git namespace; see linkgit:gitnamespaces[7] for details.
 -	The '--namespace' command-line option also sets this value.
 +	The `--namespace` command-line option also sets this value.
  
  `GIT_CEILING_DIRECTORIES`::
  	This should be a colon-separated list of absolute paths.  If
@@@ -980,7 -981,7 +981,7 @@@ othe
  	The command will be given exactly two or four arguments: the
  	'username@host' (or just 'host') from the URL and the shell
  	command to execute on that remote system, optionally preceded by
 -	'-p' (literally) and the 'port' from the URL when it specifies
 +	`-p` (literally) and the 'port' from the URL when it specifies
  	something other than the default SSH port.
  +
  `$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
@@@ -1084,14 -1085,6 +1085,14 @@@ of clones and fetches
  	cloning of shallow repositories.
  	See `GIT_TRACE` for available trace output options.
  
 +`GIT_TRACE_CURL`::
 +	Enables a curl full trace dump of all incoming and outgoing data,
 +	including descriptive information, of the git transport protocol.
 +	This is similar to doing curl `--trace-ascii` on the command line.
 +	This option overrides setting the `GIT_CURL_VERBOSE` environment
 +	variable.
 +	See `GIT_TRACE` for available trace output options.
 +
  `GIT_LITERAL_PATHSPECS`::
  	Setting this variable to `1` will cause Git to treat all
  	pathspecs literally, rather than as glob patterns. For example,