Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
docs: describe behavior of relative submodule URLs
Documentation: read-tree --prefix works with existing subtrees
Add MYMETA.json to perl/.gitignore

diff --combined Documentation/git-submodule.txt
index 6ec3fef0799222e67cb176d00aae2f583004032d,cd9c167e0aa063205bbfae2a27bc49c4334b903d..b72964947afcc39af3b97c5b9eeb1969b44e0d05
--- 1/Documentation/git-submodule.txt
--- 2/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -79,7 -79,12 +79,12 @@@ to exist in the superproject. If <path
  <repository> is the URL of the new submodule's origin repository.
  This may be either an absolute URL, or (if it begins with ./
  or ../), the location relative to the superproject's origin
- repository. If the superproject doesn't have an origin configured
+ repository (Please note that to specify a repository 'foo.git'
+ which is located right next to a superproject 'bar.git', you'll
+ have to use '../foo.git' instead of './foo.git' - as one might expect
+ when following the rules for relative URLs - because the evaluation
+ of relative URLs in Git is identical to that of relative directories).
+ If the superproject doesn't have an origin configured
  the superproject is its own authoritative upstream and the current
  working directory is used instead.
  +
@@@ -120,8 -125,6 +125,8 @@@ too (and can also report changes to a s
  init::
        Initialize the submodules, i.e. register each submodule name
        and url found in .gitmodules into .git/config.
 +      It will also copy the value of `submodule.$name.update` into
 +      .git/config.
        The key used in .git/config is `submodule.$name.url`.
        This command does not alter existing information in .git/config.
        You can then customize the submodule clone URLs in .git/config
@@@ -135,7 -138,7 +140,7 @@@ update:
        checkout the commit specified in the index of the containing repository.
        This will make the submodules HEAD be detached unless `--rebase` or
        `--merge` is specified or the key `submodule.$name.update` is set to
 -      `rebase` or `merge`.
 +      `rebase`, `merge` or `none`.
  +
  If the submodule is not yet initialized, and you just want to use the
  setting as stored in .gitmodules, you can automatically initialize the
@@@ -143,10 -146,6 +148,10 @@@ submodule with the `--init` option
  +
  If `--recursive` is specified, this command will recurse into the
  registered submodules, and update any nested submodules within.
 ++
 +If the configuration key `submodule.$name.update` is set to `none` the
 +submodule with name `$name` will not be updated by default. This can be
 +overriden by adding `--checkout` to the command.
  
  summary::
        Show commit summary between the given commit (defaults to HEAD) and