From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:03:50 +0000 (-0700)
Subject: Sync with 2.10.2
X-Git-Tag: v2.11.0-rc0~12
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/7805bda2ac68c659b0042f45473723d9fdcece74?hp=-c

Sync with 2.10.2
---

7805bda2ac68c659b0042f45473723d9fdcece74
diff --combined Documentation/git.txt
index 2cf7e225f5,ed717e4336..ab7215eee2
--- 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,9 -43,10 +44,10 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.10.1/git.html[documentation for release 2.10.1]
+ * link:v2.10.2/git.html[documentation for release 2.10.2]
  
  * release notes for
+   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].
  
@@@ -603,11 -603,6 +604,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