From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 04:26:31 +0000 (+0900)
Subject: Merge branch 'maint-2.10' into maint-2.11
X-Git-Tag: v2.11.2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a849d36cf2877a1890371851710382f463290978?ds=inline;hp=-c

Merge branch 'maint-2.10' into maint-2.11
---

a849d36cf2877a1890371851710382f463290978
diff --combined Documentation/git.txt
index bdab261515,89157e2d45..2a663e5b57
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -13,7 -13,6 +13,7 @@@ SYNOPSI
      [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
      [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
      [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
 +    [--super-prefix=<path>]
      <command> [<args>]
  
  DESCRIPTION
@@@ -44,47 -43,47 +44,53 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.11.1/git.html[documentation for release 2.11.1]
 +
 +* release notes for
 +  link:RelNotes/2.11.1.txt[2.11.1],
 +  link:RelNotes/2.11.0.txt[2.11].
 +
- * link:v2.10.2/git.html[documentation for release 2.10.2]
+ * link:v2.10.3/git.html[documentation for release 2.10.3]
  
  * release notes for
+   link:RelNotes/2.10.3.txt[2.10.3],
    link:RelNotes/2.10.2.txt[2.10.2],
    link:RelNotes/2.10.1.txt[2.10.1],
    link:RelNotes/2.10.0.txt[2.10].
  
- * link:v2.9.3/git.html[documentation for release 2.9.3]
+ * link:v2.9.4/git.html[documentation for release 2.9.4]
  
  * release notes for
+   link:RelNotes/2.9.4.txt[2.9.4],
    link:RelNotes/2.9.3.txt[2.9.3],
    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].
  
- * link:v2.8.4/git.html[documentation for release 2.8.4]
+ * link:v2.8.5/git.html[documentation for release 2.8.5]
  
  * release notes for
+   link:RelNotes/2.8.5.txt[2.8.5],
    link:RelNotes/2.8.4.txt[2.8.4],
    link:RelNotes/2.8.3.txt[2.8.3],
    link:RelNotes/2.8.2.txt[2.8.2],
    link:RelNotes/2.8.1.txt[2.8.1],
    link:RelNotes/2.8.0.txt[2.8].
  
- * link:v2.7.3/git.html[documentation for release 2.7.3]
+ * link:v2.7.5/git.html[documentation for release 2.7.5]
  
  * release notes for
+   link:RelNotes/2.7.5.txt[2.7.5],
+   link:RelNotes/2.7.4.txt[2.7.4],
    link:RelNotes/2.7.3.txt[2.7.3],
    link:RelNotes/2.7.2.txt[2.7.2],
    link:RelNotes/2.7.1.txt[2.7.1],
    link:RelNotes/2.7.0.txt[2.7].
  
- * link:v2.6.6/git.html[documentation for release 2.6.6]
+ * link:v2.6.7/git.html[documentation for release 2.6.7]
  
  * release notes for
+   link:RelNotes/2.6.7.txt[2.6.7],
    link:RelNotes/2.6.6.txt[2.6.6],
    link:RelNotes/2.6.5.txt[2.6.5],
    link:RelNotes/2.6.4.txt[2.6.4],
@@@ -93,9 -92,10 +99,10 @@@
    link:RelNotes/2.6.1.txt[2.6.1],
    link:RelNotes/2.6.0.txt[2.6].
  
- * link:v2.5.5/git.html[documentation for release 2.5.5]
+ * link:v2.5.6/git.html[documentation for release 2.5.6]
  
  * release notes for
+   link:RelNotes/2.5.6.txt[2.5.6],
    link:RelNotes/2.5.5.txt[2.5.5],
    link:RelNotes/2.5.4.txt[2.5.4],
    link:RelNotes/2.5.3.txt[2.5.3],
@@@ -103,9 -103,10 +110,10 @@@
    link:RelNotes/2.5.1.txt[2.5.1],
    link:RelNotes/2.5.0.txt[2.5].
  
- * link:v2.4.11/git.html[documentation for release 2.4.11]
+ * link:v2.4.12/git.html[documentation for release 2.4.12]
  
  * release notes for
+   link:RelNotes/2.4.12.txt[2.4.12],
    link:RelNotes/2.4.11.txt[2.4.11],
    link:RelNotes/2.4.10.txt[2.4.10],
    link:RelNotes/2.4.9.txt[2.4.9],
@@@ -610,11 -611,6 +618,11 @@@ foo.bar= ...`) sets `foo.bar` to the em
  	details.  Equivalent to setting the `GIT_NAMESPACE` environment
  	variable.
  
 +--super-prefix=<path>::
 +	Currently for internal use only.  Set a prefix which gives a path from
 +	above a repository down to its root.  One use is to give submodules
 +	context about the superproject that invoked it.
 +
  --bare::
  	Treat the repository as a bare repository.  If GIT_DIR
  	environment is not set, it is set to the current working
@@@ -872,12 -868,6 +880,12 @@@ Git so take care if using a foreign fro
  	specifies a ":" separated (on Windows ";" separated) list
  	of Git object directories which can be used to search for Git
  	objects. New objects will not be written to these directories.
 ++
 +	Entries that begin with `"` (double-quote) will be interpreted
 +	as C-style quoted paths, removing leading and trailing
 +	double-quotes and respecting backslash escapes. E.g., the value
 +	`"path-with-\"-and-:-in-it":vanilla-path` has two paths:
 +	`path-with-"-and-:-in-it` and `vanilla-path`.
  
  `GIT_DIR`::
  	If the `GIT_DIR` environment variable is set then it